diff --git a/main/data/im.dino.Dino.appdata.xml b/main/data/im.dino.Dino.appdata.xml
index 3ef17748..4400912b 100644
--- a/main/data/im.dino.Dino.appdata.xml
+++ b/main/data/im.dino.Dino.appdata.xml
@@ -15,7 +15,7 @@
   <summary xml:lang="lb">Modernen XMPP Chat Client</summary>
   <summary xml:lang="it">Client di chat moderno per XMPP</summary>
   <summary xml:lang="hu">Modern XMPP Üzenetküldő</summary>
-  <summary xml:lang="gl">Cliente moderno para conversas XMPP</summary>
+  <summary xml:lang="gl">Cliente moderno para parolas XMPP</summary>
   <summary xml:lang="fr">Client XMPP moderne</summary>
   <summary xml:lang="eu">XMPP txat bezero modernoa</summary>
   <summary xml:lang="es">Cliente de XMPP moderno</summary>
@@ -33,7 +33,7 @@
     <p xml:lang="lb">Dino ass e modernen, quell-offene Chat Client fir den Desktop. Hien biet eng opgeraumt a robust Jabber/XMPP Erfarung a leet ee Schwéierpunkt op Privatsphär.</p>
     <p xml:lang="it">Dino è un client di chat per il desktop, moderno e open-source. Si concentra nel fornire un'esperienza Jabber/XMPP pulita e affidabile tenendo presente la tua privacy.</p>
     <p xml:lang="hu">A Dino egy modern, nyílt forráskódú üzenetküldő alkalmazás asztali rendszerekre, ami a hangsúlyt a letisztult és megbízható Jabber/XMPP élményre helyezi, miközben a magánszféra megőrzését is fontosnak tartja.</p>
-    <p xml:lang="gl">Dino é un cliente moderno e de código aberto para o escritorio. Orientado a proporcionar unha experiencia Jabber/XMPP limpa e fiable tendo a intimidade presente.</p>
+    <p xml:lang="gl">Dino é un cliente moderno e de código aberto para o escritorio. Orientado a fornecer unha experiencia Jabber/XMPP limpa e fiábel tendo a privacidade e seguranza presentes.</p>
     <p xml:lang="fr">Dino est un client de chat libre et moderne pour le bureau. Il tente de fournir une expérience Jabber/XMPP simple et fiable tout en ayant toujours à l’esprit votre vie privée.</p>
     <p xml:lang="fi">Dino on nykyaikainen avoimen lähdekoodin jutteluohjelma työpöydälle. Se keskittyy tarjoamaan selkeän ja luotettavan Jabber/XMPP-kokemuksen unohtamatta yksityisyyttäsi.</p>
     <p xml:lang="eu">Dino mahaigainerako iturburu irekiko txat bezero moderno bat da. Jabber/XMPP esperientzia garbi eta fidagarri bat ematen du zure pribatutasuna kontuan hartzeaz gain.</p>
@@ -51,7 +51,7 @@
     <p xml:lang="lb">Hien ënnerstëtz Enn-zu-Enn Verschlësselung mat OMEMO an OpenPGP an enthält Privatsphäre-Astellungen zu Liesbestätegungen an Tipp-Benoriichtegungen.</p>
     <p xml:lang="it">Support la crittografia end-to-end tramite OMEMO e OpenPGP e permette di configurare le funzioni relative alla privacy come le ricevute di lettura e le notifiche di digitazione.</p>
     <p xml:lang="hu">Támogatja a végponttól-végpontig titkosítást az OMEMO és az OpenPGP által, és magánszférához kötődő beállítási lehetőségeket is biztosít, mint például a kézbesítési, vagy gépelési értesítések küldése.</p>
-    <p xml:lang="gl">Soporta o cifrado de extremo-a-extremo con OMEMO e OpenPGP e permite configurar características orientadas a intimidade tales como confirmación de lectura e notificacións de escritura.</p>
+    <p xml:lang="gl">Suporta o cifrado de punto-a-punto con OMEMO e OpenPGP e permite configurar trazos orientados á privacidade tales coma confirmación de lectura e notificacións de escritura.</p>
     <p xml:lang="fr">Il prend en charge le chiffrement de bout en bout avec OMEMO et OpenPGP et permet de configurer les fonctions liées à la vie privée telles que l’accusé de réception et les notifications de frappe.</p>
     <p xml:lang="fi">Se tukee päästä päähän -salausta OMEMO:n ja OpenPGP:n avulla ja  mahdollistaa yksityisyyteen liittyvien ominaisuuksien, kuten lukukuittausten ja kirjoitusilmoitusten asetusten määrittämisen.</p>
     <p xml:lang="eu">Amaieratik amaierarako enkriptazioa onartzen du OMEMO eta OpenPGPrekin eta pribatutasun ezaugarriak konfiguratzea baimentzen du irakurtze markak eta idazketa jakinarazpenak bezala.</p>
@@ -70,7 +70,7 @@
     <p xml:lang="lb">Dino rifft  Gespréichverläf vum Server of a synchroniséiert Noriichte mat anere Geräter.</p>
     <p xml:lang="it">Dino recupera la cronologia dal server e sincronizza i messaggi con gli altri dispositivi.</p>
     <p xml:lang="hu">A Dino lekéri a chat előzményeket a szerverről, és szinkronizálja az üzeneteket a többi eszközzel.</p>
-    <p xml:lang="gl">Dino obtén o histórico desde o servidor e sincroniza as mensaxes con outros dispositivos.</p>
+    <p xml:lang="gl">Dino obtén o histórico dende o servidor e sincroniza as mensaxes con outros dispositivos.</p>
     <p xml:lang="fr">Dino récupère l’historique du serveur et synchronise les messages avec d'autres appareils.</p>
     <p xml:lang="fi">Dino hakee historian palvelimelta ja synkronisoi viestit muiden laitteiden kanssa.</p>
     <p xml:lang="eu">Dinok zerbitzaritik hartzen du historia eta beste gailuekin mezuak sinkronizatzen ditu.</p>
@@ -93,7 +93,7 @@
       <caption xml:lang="lb">Haaptfënster mat den Conversatiounen</caption>
       <caption xml:lang="it">La finestra principale con le conversazioni</caption>
       <caption xml:lang="hu">A fő ablak a beszélgetésekkel</caption>
-      <caption xml:lang="gl">Xanela principal con conversas</caption>
+      <caption xml:lang="gl">Lapela principal con parolas</caption>
       <caption xml:lang="fr">Fenêtre principale avec des conversations</caption>
       <caption xml:lang="fi">Keskustelut pääikkunassa</caption>
       <caption xml:lang="eu">Leiho nagusia elkarrizketekin</caption>
@@ -116,7 +116,7 @@
       <caption xml:lang="lb">Konversatioun starten</caption>
       <caption xml:lang="it">Inizia una Conversazione</caption>
       <caption xml:lang="hu">Csevegés kezdeményezése</caption>
-      <caption xml:lang="gl">Iniciar Conversa</caption>
+      <caption xml:lang="gl">Comezar parola</caption>
       <caption xml:lang="fr">Commencer une discussion</caption>
       <caption xml:lang="fi">Aloita keskustelu</caption>
       <caption xml:lang="eu">Elkarrizketa hasi</caption>
diff --git a/main/po/ar.po b/main/po/ar.po
index f04492a9..e1954d55 100644
--- a/main/po/ar.po
+++ b/main/po/ar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
-"PO-Revision-Date: 2018-10-23 21:35+0000\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
+"PO-Revision-Date: 2018-10-24 22:22+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/dino/translations/"
 "ar/>\n"
@@ -20,24 +20,44 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 3.3-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "طلب اشتراك"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "قبول"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "رفض"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
-msgstr ""
+msgstr "فشل الاتصال بـ %s"
 
 #: main/src/ui/manage_accounts/dialog.vala:126
 #, c-format
@@ -131,35 +151,35 @@ msgstr "إنشاء حساب"
 msgid "Check %s for information on how to sign up"
 msgstr "إطّلع على %s للمزيد من المعلومات حول التسجيل"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "أنا"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "البارحة"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -171,7 +191,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] "منذ %i دقائق"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "الآن"
@@ -209,7 +229,7 @@ msgstr "التالي"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "الشروع في محادثة"
 
@@ -393,7 +413,7 @@ msgid "Conference Details"
 msgstr "تفاصيل فريق المحادثة"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "تفاصيل عن المُراسل"
 
@@ -584,11 +604,11 @@ msgstr "غير مشفّرة"
 msgid "Quit"
 msgstr "الخروج"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "تطبيق حديث للدردشة عبر XMPP"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -597,7 +617,7 @@ msgstr ""
 "دينو برنامج حديث ومفتوح المصدر للدردشة صُمّم لسطح المكتب. ويُركّز علي تقديم "
 "تجربة نظيفة وموثوق منها لجابر/XMPP مع أخذ خصوصيتكم بعين الإعتبار."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -606,13 +626,13 @@ msgstr ""
 "وهو يدعم التشفير بواسطة OMEMO و OpenPGP يسمح بإعداد ميزات الخصوصية "
 "كالإيصالات المقروءة والإخطارات عند الكتابة."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr "يقوم دينو بجلب السِجلّ مِن السيرفر ثم يُزامِن الرسائل مع الأجهزة الأخرى."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "النافذة الرئيسية بالمُحادثات"
 
diff --git a/main/po/ca.po b/main/po/ca.po
index 4d93de40..6d2bb03f 100644
--- a/main/po/ca.po
+++ b/main/po/ca.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino 20180510\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-05-10 14:38+0200\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/dino/"
@@ -17,21 +17,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Petició de subscripció"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Acepta"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rebutja"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -128,35 +148,35 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Jo"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H.%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l.%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -164,7 +184,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "fa %i minut"
 msgstr[1] "fa %i minuts"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Ara mateix"
@@ -202,7 +222,7 @@ msgstr "Següent"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
@@ -382,7 +402,7 @@ msgid "Conference Details"
 msgstr "Detalls de la conferència"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Detalls del contacte"
 
@@ -574,12 +594,12 @@ msgstr "Sense xifrar"
 msgid "Quit"
 msgstr "Surt"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 #, fuzzy
 msgid "Modern XMPP Chat Client"
 msgstr "Client d'XMPP modern"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -589,7 +609,7 @@ msgstr ""
 "proveir una experiència neta i fiable de Jabber/XMPP, sempre tenint en "
 "compte la vostra privacitat."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -599,7 +619,7 @@ msgstr ""
 "funcionalitats relacionades amb la privacitat com per exemple rebuts de "
 "lectura i notificacions d'escriptura."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -607,7 +627,7 @@ msgstr ""
 "Dino recupera l'historial del servidor i sincronitza els missatges amb "
 "altres dispositius."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Finestra principal amb converses"
 
diff --git a/main/po/de.po b/main/po/de.po
index f7b0788e..0813e318 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
-"PO-Revision-Date: 2018-09-18 17:25+0000\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
+"PO-Revision-Date: 2018-11-06 14:01+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/translations/"
 "de/>\n"
@@ -12,26 +12,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.2-dev\n"
+"X-Generator: Weblate 3.3-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Annehmen"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
-msgstr ""
+msgstr "Verbindung zu %s fehlgeschlagen"
 
 #: main/src/ui/manage_accounts/dialog.vala:126
 #, c-format
@@ -125,35 +145,35 @@ msgstr "Registrieren"
 msgid "Check %s for information on how to sign up"
 msgstr "Eventuell sind auf %s Informationen zur Registrierung zu finden"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Ich"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d. %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -161,7 +181,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "vor %i min"
 msgstr[1] "vor %i min"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Gerade eben"
@@ -199,7 +219,7 @@ msgstr "Weiter"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Unterhaltung starten"
 
@@ -379,7 +399,7 @@ msgid "Conference Details"
 msgstr "Konferenzdetails"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Kontaktdetails"
 
@@ -572,11 +592,11 @@ msgstr "Unverschlüsselt"
 msgid "Quit"
 msgstr "Beenden"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Moderner XMPP Chat Client"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -586,7 +606,7 @@ msgstr ""
 "und robuste Jabber/XMPP Erfahrung und legt einen Schwerpunkt auf "
 "Privatsphäre."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -596,7 +616,7 @@ msgstr ""
 "enthält Privatsphäre-Einstellungen zu Lesebestätigungen und "
 "Tippbenachrichtigungen."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -604,7 +624,7 @@ msgstr ""
 "Dino ruft Gesprächsverläufe vom Server ab und synchronisiert Nachrichten mit "
 "anderen Geräten."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Hauptfenster mit Konversationen"
 
diff --git a/main/po/dino.pot b/main/po/dino.pot
index 2f7e5c1e..9c0d592f 100644
--- a/main/po/dino.pot
+++ b/main/po/dino.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,21 +18,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr ""
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -129,35 +149,35 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -165,7 +185,7 @@ msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr ""
@@ -203,7 +223,7 @@ msgstr ""
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
@@ -383,7 +403,7 @@ msgid "Conference Details"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr ""
 
@@ -574,31 +594,31 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr ""
 
diff --git a/main/po/en.po b/main/po/en.po
index 75216ebb..0f9d3475 100644
--- a/main/po/en.po
+++ b/main/po/en.po
@@ -2,27 +2,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr ""
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -119,35 +139,35 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -155,7 +175,7 @@ msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr ""
@@ -193,7 +213,7 @@ msgstr ""
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
@@ -373,7 +393,7 @@ msgid "Conference Details"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr ""
 
@@ -564,31 +584,31 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr ""
 
diff --git a/main/po/eo.po b/main/po/eo.po
index b449a285..c8293dc8 100644
--- a/main/po/eo.po
+++ b/main/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-03-31 13:36+0000\n"
 "Last-Translator: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/dino/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.20-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Abona peto"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akcepti"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,35 +150,35 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "Antaŭ %i minuto"
 msgstr[1] "Antaŭ %i minutoj"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Ĵus"
@@ -204,7 +224,7 @@ msgstr "Sekva"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
@@ -385,7 +405,7 @@ msgid "Conference Details"
 msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Kontaktaj Detaloj"
 
@@ -576,31 +596,31 @@ msgstr "Neĉifrita"
 msgid "Quit"
 msgstr "Ĉesi"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr ""
 
diff --git a/main/po/es.po b/main/po/es.po
index 7232e398..54ed6814 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-29 07:35+0000\n"
 "Last-Translator: Bonber Rash <bonber@protonmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/dino/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Solicitud de suscripción"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Aceptar"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Denegar"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,35 +150,35 @@ msgstr "Registro"
 msgid "Check %s for information on how to sign up"
 msgstr "Mira %s para mas información sobre el registro"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Yo"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "hace %i min"
 msgstr[1] "hace %i mins"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Ahora"
@@ -204,7 +224,7 @@ msgstr "Siguiente"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Iniciar conversación"
 
@@ -385,7 +405,7 @@ msgid "Conference Details"
 msgstr "Detalles de la Conversación"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Detalles del contacto"
 
@@ -578,11 +598,11 @@ msgstr "Sin cifrar"
 msgid "Quit"
 msgstr "Salir"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Cliente de XMPP moderno"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -592,7 +612,7 @@ msgstr ""
 "enfocado en proveer una experiencia Jabber/XMPP limpia y confiable teniendo "
 "tu privacidad en mente."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -602,7 +622,7 @@ msgstr ""
 "configurar las características relacionadas con la privacidad, como "
 "confirmaciones de lectura y notificaciones de escritura."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -610,7 +630,7 @@ msgstr ""
 "Dino recupera los mensajes desde el servidor y sincroniza los mensajes con "
 "otros dispositivos."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Ventana principal con conversaciones"
 
diff --git a/main/po/eu.po b/main/po/eu.po
index 7696f6e2..2b02b48c 100644
--- a/main/po/eu.po
+++ b/main/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-11 15:13+0000\n"
 "Last-Translator: Aitor Beriain <beriain@bitmessage.ch>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/dino/translations/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Harpidetzaren eskaera"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Onartu"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Ukatu"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,35 +150,35 @@ msgstr "Izena eman"
 msgid "Check %s for information on how to sign up"
 msgstr "Ikusi %s izena ematearen inguruko informazioa lortzeko"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Ni"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Atzo"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "orain dela min %i"
 msgstr[1] "orain dela %i min"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Orain"
@@ -204,7 +224,7 @@ msgstr "Hurrengoa"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Elkarrizketa hasi"
 
@@ -384,7 +404,7 @@ msgid "Conference Details"
 msgstr "Konferentziaren xehetasunak"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Kontaktuaren xehetasunak"
 
@@ -577,11 +597,11 @@ msgstr "Enkriptatu gabe"
 msgid "Quit"
 msgstr "Irten"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "XMPP txat bezero modernoa"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -591,7 +611,7 @@ msgstr ""
 "esperientzia garbi eta fidagarri bat ematen du zure pribatutasuna kontuan "
 "hartzeaz gain."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -601,7 +621,7 @@ msgstr ""
 "pribatutasun ezaugarriak konfiguratzea baimentzen du irakurtze markak eta "
 "idazketa jakinarazpenak bezala."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -609,7 +629,7 @@ msgstr ""
 "Dinok zerbitzaritik hartzen du historia eta beste gailuekin mezuak "
 "sinkronizatzen ditu."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Leiho nagusia elkarrizketekin"
 
diff --git a/main/po/fi.po b/main/po/fi.po
index 8bee495f..01633558 100644
--- a/main/po/fi.po
+++ b/main/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-05-13 10:18+0000\n"
 "Last-Translator: mjlapin <muu@kapsi.fi>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/dino/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.0-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Yhteyspyyntö"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Hylkää"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,35 +150,35 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Minä"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d. %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i min sitten"
 msgstr[1] "%i min sitten"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Juuri nyt"
@@ -204,7 +224,7 @@ msgstr "Seuraava"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Aloita keskustelu"
 
@@ -384,7 +404,7 @@ msgid "Conference Details"
 msgstr "Ryhmäkeskustelun yksityiskohdat"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Yhteystiedot"
 
@@ -575,12 +595,12 @@ msgstr "Salaamaton"
 msgid "Quit"
 msgstr "Lopeta"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 #, fuzzy
 msgid "Modern XMPP Chat Client"
 msgstr "Moderni XMPP-asiakasohjelma"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -590,7 +610,7 @@ msgstr ""
 "keskittyy tarjoamaan selkeän ja luotettavan Jabber/XMPP-kokemuksen "
 "unohtamatta yksityisyyttäsi."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -600,7 +620,7 @@ msgstr ""
 "mahdollistaa yksityisyyteen liittyvien ominaisuuksien, kuten lukukuittausten "
 "ja kirjoitusilmoitusten asetusten määrittämisen."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -608,7 +628,7 @@ msgstr ""
 "Dino hakee historian palvelimelta ja synkronisoi viestit muiden laitteiden "
 "kanssa."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Keskustelut pääikkunassa"
 
diff --git a/main/po/fr.po b/main/po/fr.po
index ffd79de0..ec4fd52b 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-10-22 04:29+0000\n"
 "Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/translations/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.3-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Demande d’abonnement"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Accepter"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Refuser"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,35 +150,35 @@ msgstr "S’inscrire"
 msgid "Check %s for information on how to sign up"
 msgstr "Consultez %s pour plus d’informations sur comment s’inscrire"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Moi"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Hier"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%Hh%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "Il y a %i minute"
 msgstr[1] "Il y a %i minutes"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "À l’instant"
@@ -204,7 +224,7 @@ msgstr "Suivant"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Commencer une discussion"
 
@@ -384,7 +404,7 @@ msgid "Conference Details"
 msgstr "Informations du salon"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Informations du contact"
 
@@ -576,11 +596,11 @@ msgstr "Non-chiffré"
 msgid "Quit"
 msgstr "Quitter"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Client XMPP moderne"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -590,7 +610,7 @@ msgstr ""
 "fournir une expérience Jabber/XMPP simple et fiable tout en ayant toujours à "
 "l’esprit votre vie privée."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -600,7 +620,7 @@ msgstr ""
 "permet de configurer les fonctions liées à la vie privée telles que l’accusé "
 "de réception et les notifications de frappe."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -608,7 +628,7 @@ msgstr ""
 "Dino récupère l’historique du serveur et synchronise les messages avec "
 "d'autres appareils."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Fenêtre principale avec des conversations"
 
diff --git a/main/po/gl.po b/main/po/gl.po
index 16a64742..19cc05e7 100644
--- a/main/po/gl.po
+++ b/main/po/gl.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
-"PO-Revision-Date: 2018-09-29 05:27+0000\n"
-"Last-Translator: Xosé M <xosem@disroot.org>\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
+"PO-Revision-Date: 2018-10-26 16:29+0000\n"
+"Last-Translator: Iván Seoane <ivanrsm1997@gmail.com>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/dino/"
 "translations/gl/>\n"
 "Language: gl\n"
@@ -17,31 +17,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.2-dev\n"
+"X-Generator: Weblate 3.3-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
-msgstr "Petición de suscrición"
+msgstr "Solicitude de subscrición"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
-msgstr "Aceptar"
+msgstr "Feito"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rexeitar"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
-msgstr ""
+msgstr "Ocorreu un erro ó conectar cara %s"
 
 #: main/src/ui/manage_accounts/dialog.vala:126
 #, c-format
 msgid "Remove account %s?"
-msgstr "Eliminar a conta %s?"
+msgstr "Elimina-la conta %s?"
 
 #: main/src/ui/manage_accounts/dialog.vala:129
 msgid "Remove"
@@ -49,11 +69,11 @@ msgstr "Eliminar"
 
 #: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select avatar"
-msgstr "Escoller avatar"
+msgstr "Escoller imaxe do perfil"
 
 #: main/src/ui/manage_accounts/dialog.vala:153
 msgid "Select"
-msgstr "Escolla"
+msgstr "Escoller"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:44
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
@@ -61,7 +81,7 @@ msgstr "Escolla"
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Desbotar"
 
 #: main/src/ui/manage_accounts/dialog.vala:161
 msgid "Images"
@@ -69,19 +89,19 @@ msgstr "Imaxes"
 
 #: main/src/ui/manage_accounts/dialog.vala:165
 msgid "All files"
-msgstr "Todos os ficheiros"
+msgstr "Tódolos ficheiros"
 
 #: main/src/ui/manage_accounts/dialog.vala:222
 msgid "Connecting…"
-msgstr "Conectando…"
+msgstr "Estase a conectar…"
 
 #: main/src/ui/manage_accounts/dialog.vala:224
 msgid "Connected"
-msgstr "Conectada"
+msgstr "Conectado"
 
 #: main/src/ui/manage_accounts/dialog.vala:226
 msgid "Disconnected"
-msgstr "Desconectada"
+msgstr "Desconectado"
 
 #: main/src/ui/manage_accounts/dialog.vala:235
 msgid "Wrong password"
@@ -89,12 +109,12 @@ msgstr "Contrasinal incorrecto"
 
 #: main/src/ui/manage_accounts/dialog.vala:237
 msgid "Invalid TLS certificate"
-msgstr "Certificado TLS non válido"
+msgstr "Certificado do TLS non válido"
 
 #: main/src/ui/manage_accounts/dialog.vala:240
 #: main/src/ui/manage_accounts/dialog.vala:242
 msgid "Error"
-msgstr "Fallo"
+msgstr "Erro"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:55
 msgid "Add Account"
@@ -102,7 +122,7 @@ msgstr "Engadir conta"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:135
 msgid "JID should be of the form “user@example.com”"
-msgstr "JID debe ter o formato \"usuaria@servidor.com\""
+msgstr "O JID debe te-lo formato \"usuario@exemplo.com\""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:171
 msgid "No response from server"
@@ -111,11 +131,11 @@ msgstr "Sen resposta do servidor"
 #: main/src/ui/manage_accounts/add_account_dialog.vala:177
 #, c-format
 msgid "Register on %s"
-msgstr "Rexistrar en %s"
+msgstr "Rexistrarse en %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:180
 msgid "The server requires to sign up through a website"
-msgstr "O servidor solicita que se rexistre na súa web"
+msgstr "O servidor precisa que se rexistre a través dun sitio web"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:182
 msgid "Open Registration"
@@ -128,37 +148,37 @@ msgstr "Rexistrar"
 #: main/src/ui/manage_accounts/add_account_dialog.vala:200
 #, c-format
 msgid "Check %s for information on how to sign up"
-msgstr "Comprobe %s para ter información sobre como rexistrarse"
+msgstr "Comprobe %s para máis información sobre o rexistro"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
-msgstr "%b %d"
+msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Onte"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,14 +186,14 @@ msgid_plural "%i mins ago"
 msgstr[0] "hai %i min"
 msgstr[1] "hai %i minutos"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Xusto agora"
 
 #: main/src/ui/application.vala:44
 msgid "Join Conference"
-msgstr "Unirse a Sala"
+msgstr "Unirse a un grupo"
 
 #: main/src/ui/application.vala:44
 #: main/src/ui/add_conversation/add_conference_dialog.vala:63
@@ -194,7 +214,7 @@ msgstr "Gardar"
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
 #: main/src/ui/unified_window.vala:243 main/data/menu_add.ui:13
 msgid "Join Channel"
-msgstr "Unirse a Canal"
+msgstr "Unirse a unha canle"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:48
 #: main/data/manage_accounts/add_account_dialog.ui:228
@@ -204,13 +224,13 @@ msgstr "Seguinte"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
-msgstr "Iniciar Conversa"
+msgstr "Comezar parola"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:86
 msgid "Start"
-msgstr "Iniciar"
+msgstr "Comezar"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:108
 msgid "Joining…"
@@ -218,19 +238,19 @@ msgstr "Uníndose…"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:138
 msgid "Password required to enter room"
-msgstr "Precisa un contrasinal para entrar na sala"
+msgstr "Precisa dun contrasinal para entrar na sala"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:143
 msgid "Banned from joining or creating conference"
-msgstr "Non ter permiso para unirse ou crear a conferencia"
+msgstr "Non ten permiso para unirse ou crea-lo grupo"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:145
 msgid "Room does not exist"
-msgstr "A Sala non existe"
+msgstr "A sala non existe"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:147
 msgid "Not allowed to create room"
-msgstr "Non pode crear a sala"
+msgstr "Non pode crea-la sala"
 
 #: main/src/ui/add_conversation/conference_details_fragment.vala:149
 msgid "Members-only room"
@@ -254,7 +274,7 @@ msgstr "Xestionar contas"
 
 #: main/src/ui/unified_window.vala:241
 msgid "No active conversations"
-msgstr "Sen conversas activas"
+msgstr "Sen parolas activas"
 
 #: main/src/ui/conversation_summary/date_separator_populator.vala:85
 msgid "Today"
@@ -262,7 +282,7 @@ msgstr "Hoxe"
 
 #: main/src/ui/conversation_summary/date_separator_populator.vala:98
 msgid "%a, %b %d"
-msgstr "%a, %b %d"
+msgstr "%a, %d %b"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:146
 #, c-format
@@ -283,7 +303,7 @@ msgstr "%s e %s"
 msgid "is typing…"
 msgid_plural "are typing…"
 msgstr[0] "está a escribir…"
-msgstr[1] "están escribindo…"
+msgstr[1] "están a escribir…"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:157
 msgid "has stopped typing"
@@ -299,7 +319,7 @@ msgstr "Ficheiro"
 
 #: main/src/ui/conversation_summary/subscription_notification.vala:48
 msgid "This contact would like to add you to their contact list"
-msgstr "Este contacto gostaríalle engadila a súa listaxe de contactos"
+msgstr "Esta persoa gostaríalle engadille á súa listaxe dos contactos"
 
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
 #, no-c-format
@@ -314,12 +334,12 @@ msgstr "%x, %l∶%M %p"
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
 #, no-c-format
 msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
 
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
 
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
 #, no-c-format
@@ -333,19 +353,19 @@ msgstr "%a, %l∶%M %p"
 
 #: main/src/ui/occupant_menu/list.vala:106
 msgid "Owner"
-msgstr "Dona"
+msgstr "Dono"
 
 #: main/src/ui/occupant_menu/list.vala:108
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrador"
 
 #: main/src/ui/occupant_menu/list.vala:110
 msgid "Member"
-msgstr "Participante"
+msgstr "Membro"
 
 #: main/src/ui/occupant_menu/list.vala:112
 msgid "User"
-msgstr "Usuaria"
+msgstr "Usuario"
 
 #: main/src/ui/occupant_menu/view.vala:27
 #: main/src/ui/occupant_menu/view.vala:36
@@ -354,20 +374,20 @@ msgstr "Convidar"
 
 #: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite to Conference"
-msgstr "Convidar a Conferencia"
+msgstr "Convidar ó grupo"
 
 #: main/src/ui/occupant_menu/view.vala:85
 msgid "Start private conversation"
-msgstr "Iniciar conversa privada"
+msgstr "Comezar parola privada"
 
 #: main/src/ui/occupant_menu/view.vala:93
 msgid "Kick"
-msgstr "Expulsar"
+msgstr "Botar"
 
 #: main/src/ui/global_search.vala:134
 #, c-format
 msgid "%i search results"
-msgstr "%i resultados da busca"
+msgstr "%i resultados da procura"
 
 #: main/src/ui/global_search.vala:161
 #, c-format
@@ -381,10 +401,10 @@ msgstr "Con %s"
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
-msgstr "Detalles da Conferencia"
+msgstr "Detalles do grupo"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Detalles do contacto"
 
@@ -402,23 +422,23 @@ msgstr "Persistente"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
-msgstr "A sala permanecerá despois de que salga o derradeiro ocupante"
+msgstr "A sala permanecerá despois de que saia o derradeiro participante"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
-msgstr "Pódese atopar públicamente"
+msgstr "Pódese atopar de xeito público"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
-msgstr "As participantes poden cambiar o asunto"
+msgstr "Os participantes poden muda-lo asunto"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
-msgstr "Descubrir os JIDs reais"
+msgstr "Descobri-los JIDs reais"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
-msgstr "Quen pode descubrir os JIDs reais?"
+msgstr "Quen pode descobri-los JIDs reais?"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:59
 #: main/data/manage_accounts/dialog.ui:170
@@ -430,35 +450,35 @@ msgstr "Contrasinal"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:60
 msgid "Password required for room entry, if any"
-msgstr "Contrasinal requerido para entrar na sala, si fose preciso"
+msgstr "Contrasinal precisada para entrar na sala, se houbese"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:63
 msgid "Moderated"
-msgstr "Moderada"
+msgstr "Moderado"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:64
 msgid "Only occupants with voice may send messages"
-msgstr "Só as participantes con voz poden enviar mensaxes"
+msgstr "Só os participantes con voz poden enviar mensaxes"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:67
 msgid "Members only"
-msgstr "Só participantes"
+msgstr "Só membros"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:68
 msgid "Only members may enter the room"
-msgstr "Só participantes poden entrar na sala"
+msgstr "Só os membros poden entrar na sala"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:71
 msgid "Message history"
-msgstr "Histórico de mensaxes"
+msgstr "Histórico das mensaxes"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:72
 msgid "Maximum amount of backlog issued by the room"
-msgstr "Cantidade máxima de rexistros proporcionados pola sala"
+msgstr "Morea máxima de rexistros fornecidos pola sala"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
-msgstr "Configuración da sala"
+msgstr "Axustes da sala"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
 #: main/src/ui/contact_details/settings_provider.vala:22
@@ -475,18 +495,18 @@ msgstr "Bloquear"
 #: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
-"As actualizacións de estado e comunicación están bloqueadas en calquer "
+"As actualizacións do estado e comunicación están bloqueadas en calquera "
 "dirección"
 
 #: main/src/ui/contact_details/settings_provider.vala:22
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
-msgstr "Enviar notificacións de escritura"
+msgstr "Enviar notificacións ó escribir"
 
 #: main/src/ui/contact_details/settings_provider.vala:25
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
-msgstr "Enviar confirmación de lectura"
+msgstr "Enviar confirmacións de lectura"
 
 #: main/src/ui/contact_details/settings_provider.vala:30
 #: main/src/ui/contact_details/settings_provider.vala:39
@@ -501,23 +521,23 @@ msgstr "Axustes locais"
 #: main/src/ui/contact_details/settings_provider.vala:114
 #: main/src/ui/contact_details/settings_provider.vala:116
 msgid "On"
-msgstr "On"
+msgstr "Habilitado"
 
 #: main/src/ui/contact_details/settings_provider.vala:76
 #: main/src/ui/contact_details/settings_provider.vala:114
 #: main/src/ui/contact_details/settings_provider.vala:117
 msgid "Off"
-msgstr "Off"
+msgstr "Inhabilitado"
 
 #: main/src/ui/contact_details/settings_provider.vala:78
 msgid "Only when mentioned"
-msgstr "Só cando mencionada"
+msgstr "Só cando che mencionan"
 
 #: main/src/ui/contact_details/settings_provider.vala:80
 #: main/src/ui/contact_details/settings_provider.vala:115
 #, c-format
 msgid "Default: %s"
-msgstr "Por omisión: %s"
+msgstr "Por defecto: %s"
 
 #: main/data/settings_dialog.ui:7
 msgid "Preferences"
@@ -563,7 +583,7 @@ msgstr "Ou indicar un enderezo de servidor"
 
 #: main/data/manage_accounts/add_account_dialog.ui:207
 msgid "Sign in instead"
-msgstr "ou Conectarse"
+msgstr "Iniciar sesión no tocante diso"
 
 #: main/data/manage_accounts/add_account_dialog.ui:288
 msgid "Pick another server"
@@ -577,41 +597,41 @@ msgstr "Non cifrado"
 msgid "Quit"
 msgstr "Saír"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
-msgstr "Cliente moderno para conversas XMPP"
+msgstr "Cliente moderno para parolas XMPP"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
 "Dino é un cliente moderno e de código aberto para o escritorio. Orientado a "
-"proporcionar unha experiencia Jabber/XMPP limpa e fiable tendo a intimidade "
-"presente."
+"fornecer unha experiencia Jabber/XMPP limpa e fiábel tendo a privacidade e "
+"seguranza presentes."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
-"Soporta o cifrado de extremo-a-extremo con OMEMO e OpenPGP e permite "
-"configurar características orientadas a intimidade tales como confirmación "
-"de lectura e notificacións de escritura."
+"Suporta o cifrado de punto-a-punto con OMEMO e OpenPGP e permite configurar "
+"trazos orientados á privacidade tales coma confirmación de lectura e "
+"notificacións de escritura."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
-"Dino obtén o histórico desde o servidor e sincroniza as mensaxes con outros "
+"Dino obtén o histórico dende o servidor e sincroniza as mensaxes con outros "
 "dispositivos."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
-msgstr "Xanela principal con conversas"
+msgstr "Lapela principal con parolas"
 
 #: main/data/add_conversation/conference_details_fragment.ui:19
 #: main/data/add_conversation/add_groupchat_dialog.ui:49
@@ -635,11 +655,11 @@ msgstr "Engadir contacto"
 
 #: main/data/global_search.ui:37
 msgid "No active search"
-msgstr "Sen busca activa"
+msgstr "Sen procura activa"
 
 #: main/data/global_search.ui:52
 msgid "Type to start a search"
-msgstr "Escriba para iniciar a busca"
+msgstr "Escriba para comezar unha procura"
 
 #: main/data/global_search.ui:85
 msgid "No matching messages"
@@ -647,7 +667,7 @@ msgstr "Sen mensaxes coincidentes"
 
 #: main/data/global_search.ui:100
 msgid "Check the spelling or try to remove filters"
-msgstr "Comprobe a escrita ou intente eliminar filtros"
+msgstr "Comprobe a escrita ou tente eliminar filtros"
 
 #~ msgid "Copy Link Address"
 #~ msgstr "Copiar enderezo da ligazón"
diff --git a/main/po/hu.po b/main/po/hu.po
index c9e5bae7..4ac1e251 100644
--- a/main/po/hu.po
+++ b/main/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-08-31 14:13+0000\n"
 "Last-Translator: notramo <notramo@vipmail.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/dino/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Feliratkozási kérés"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Elfogadás"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Tiltás"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -131,35 +151,35 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Én"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Tegnap"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H:%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%I:%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -167,7 +187,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i perccel ezelőtt"
 msgstr[1] "%i perccel ezelőtt"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Most"
@@ -205,7 +225,7 @@ msgstr "Következő"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Csevegés kezdeményezése"
 
@@ -385,7 +405,7 @@ msgid "Conference Details"
 msgstr "A konferencia részletei"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Felhasználó információ"
 
@@ -577,11 +597,11 @@ msgstr "Titkosítatlan"
 msgid "Quit"
 msgstr "Kilépés"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Modern XMPP Üzenetküldő"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -591,7 +611,7 @@ msgstr ""
 "rendszerekre, ami a hangsúlyt a letisztult és megbízható Jabber/XMPP "
 "élményre helyezi, miközben a magánszféra megőrzését is fontosnak tartja."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -601,7 +621,7 @@ msgstr ""
 "és magánszférához kötődő beállítási lehetőségeket is biztosít, mint például "
 "a kézbesítési, vagy gépelési értesítések küldése."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -609,7 +629,7 @@ msgstr ""
 "A Dino lekéri a chat előzményeket a szerverről, és szinkronizálja az "
 "üzeneteket a többi eszközzel."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "A fő ablak a beszélgetésekkel"
 
diff --git a/main/po/it.po b/main/po/it.po
index 32a98ad1..be863b27 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
-"PO-Revision-Date: 2018-09-12 07:20+0000\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
+"PO-Revision-Date: 2018-10-25 13:52+0000\n"
 "Last-Translator: Valerio Baldisserotto <svalo@libersoft.it>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/dino/"
 "translations/it/>\n"
@@ -17,26 +17,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.2-dev\n"
+"X-Generator: Weblate 3.3-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Richiesta di iscrizione"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Accetta"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rifiuta"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
-msgstr ""
+msgstr "Connessione a %s fallita"
 
 #: main/src/ui/manage_accounts/dialog.vala:126
 #, c-format
@@ -130,35 +150,35 @@ msgstr "Registrati"
 msgid "Check %s for information on how to sign up"
 msgstr "Controlla %s per informazioni su come registrarsi"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Io"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i minuto fa"
 msgstr[1] "%i minuti fa"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Adesso"
@@ -204,7 +224,7 @@ msgstr "Avanti"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Inizia una Conversazione"
 
@@ -384,7 +404,7 @@ msgid "Conference Details"
 msgstr "Dettagli della conferenza"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Dettagli del contatto"
 
@@ -578,11 +598,11 @@ msgstr "Non cifrato"
 msgid "Quit"
 msgstr "Esci"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Client di chat moderno per XMPP"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -592,7 +612,7 @@ msgstr ""
 "nel fornire un'esperienza Jabber/XMPP pulita e affidabile tenendo presente "
 "la tua privacy."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -602,7 +622,7 @@ msgstr ""
 "configurare le funzioni relative alla privacy come le ricevute di lettura e "
 "le notifiche di digitazione."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -610,7 +630,7 @@ msgstr ""
 "Dino recupera la cronologia dal server e sincronizza i messaggi con gli "
 "altri dispositivi."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "La finestra principale con le conversazioni"
 
diff --git a/main/po/ja.po b/main/po/ja.po
index ac3fbaeb..812a9468 100644
--- a/main/po/ja.po
+++ b/main/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-04-04 05:38+0000\n"
 "Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/dino/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.20-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "在席通知の申込"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "承諾"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "拒否"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,42 +150,42 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "昨日"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i 分前"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "たった今"
@@ -203,7 +223,7 @@ msgstr "次"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
@@ -382,7 +402,7 @@ msgid "Conference Details"
 msgstr "談話室の詳細"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "相手先の詳細"
 
@@ -573,31 +593,31 @@ msgstr "非暗号化"
 msgid "Quit"
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr ""
 
diff --git a/main/po/lb.po b/main/po/lb.po
index a28dce2a..02581d72 100644
--- a/main/po/lb.po
+++ b/main/po/lb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Luxembourgish (Dino)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-10 00:23+0000\n"
 "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
 "Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino/"
@@ -14,21 +14,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Abonnement Ufro"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akzeptéieren"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Verweigeren"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -125,35 +145,35 @@ msgstr "Registréieren"
 msgid "Check %s for information on how to sign up"
 msgstr "Kuck %s fir Informatioune iwwert Registréierung"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Ech"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gëschter"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H:%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -161,7 +181,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i Minutt hier"
 msgstr[1] "%i Minutten hier"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Just elo"
@@ -199,7 +219,7 @@ msgstr "Nächst"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Konversatioun starten"
 
@@ -379,7 +399,7 @@ msgid "Conference Details"
 msgstr "Konferenz Detailer"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Kontaktdetailer"
 
@@ -570,11 +590,11 @@ msgstr "Onverschlësselt"
 msgid "Quit"
 msgstr "Zoumaachen"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Modernen XMPP Chat Client"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -584,7 +604,7 @@ msgstr ""
 "opgeraumt a robust Jabber/XMPP Erfarung a leet ee Schwéierpunkt op "
 "Privatsphär."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -593,7 +613,7 @@ msgstr ""
 "Hien ënnerstëtz Enn-zu-Enn Verschlësselung mat OMEMO an OpenPGP an enthält "
 "Privatsphäre-Astellungen zu Liesbestätegungen an Tipp-Benoriichtegungen."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -601,7 +621,7 @@ msgstr ""
 "Dino rifft  Gespréichverläf vum Server of a synchroniséiert Noriichte mat "
 "anere Geräter."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Haaptfënster mat den Conversatiounen"
 
diff --git a/main/po/nb.po b/main/po/nb.po
index cc98f31a..9be3ee55 100644
--- a/main/po/nb.po
+++ b/main/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
-"PO-Revision-Date: 2018-09-17 23:27+0000\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
+"PO-Revision-Date: 2018-10-25 02:34+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
 "translations/nb/>\n"
@@ -17,26 +17,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.2-dev\n"
+"X-Generator: Weblate 3.3-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Abonnementsforespørsel"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Godta"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Nekt"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
-msgstr ""
+msgstr "Klarte ikke å koble til %s"
 
 #: main/src/ui/manage_accounts/dialog.vala:126
 #, c-format
@@ -130,35 +150,35 @@ msgstr "Registrer"
 msgid "Check %s for information on how to sign up"
 msgstr "Se %s for å lære hvordan du registrerer deg"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Meg"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "I går"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i minutt siden"
 msgstr[1] "%i minutter siden"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Akkurat nå"
@@ -204,7 +224,7 @@ msgstr "Neste"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Start samtale"
 
@@ -384,7 +404,7 @@ msgid "Conference Details"
 msgstr "Konferansedetaljer"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Kontaktdetaljer"
 
@@ -575,11 +595,11 @@ msgstr "Ukryptert"
 msgid "Quit"
 msgstr "Avslutt"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Moderne XMPP-sludreklient"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -589,7 +609,7 @@ msgstr ""
 "på rask og pålitelig XMPP-opplevelse, samtidig som det hegner om "
 "personvernet."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -599,7 +619,7 @@ msgstr ""
 "oppsett av personvernsrelaterte funksjoner som meldingskvitteringer og "
 "skrivevarsling."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -607,7 +627,7 @@ msgstr ""
 "Dino henter historikk fra tjeneren og synkroniserer meldinger med andre "
 "enheter."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Hovedvindu med samtaler"
 
diff --git a/main/po/nl.po b/main/po/nl.po
index 86d645ef..71c1bd58 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-24 12:24+0000\n"
 "Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/dino/translations/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Toestaan"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Afwijzen"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,35 +150,35 @@ msgstr "Registreren"
 msgid "Check %s for information on how to sign up"
 msgstr "Bekijk %s voor meer informatie over hoe te registreren"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Ik"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i min geleden"
 msgstr[1] "%i min geleden"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Zojuist"
@@ -204,7 +224,7 @@ msgstr "Volgende"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Gesprek beginnen"
 
@@ -384,7 +404,7 @@ msgid "Conference Details"
 msgstr "Groepsgespreksgegevens"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Contactgegevens"
 
@@ -576,11 +596,11 @@ msgstr "Onversleuteld"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Moderne XMPP-chatcliënt"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -590,7 +610,7 @@ msgstr ""
 "eenvoudige en betrouwbare Jabber/XMPP-ervaring, met uw privacy in het "
 "achterhoofd."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -600,7 +620,7 @@ msgstr ""
 "toe privacy-gerelateerde functies, zoals leesbevestigingen en typmeldingen, "
 "in te stellen."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -608,7 +628,7 @@ msgstr ""
 "Dino haalt de geschiedenis op van de server en synchroniseert berichten met "
 "andere apparaten."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Hoofdvenster met gesprekken"
 
diff --git a/main/po/nl_BE.po b/main/po/nl_BE.po
index b6b222c8..50988e03 100644
--- a/main/po/nl_BE.po
+++ b/main/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-10-12 10:27+0000\n"
 "Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: Flemish <https://hosted.weblate.org/projects/dino/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2.1\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Toestaan"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Afwijzen"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,35 +150,35 @@ msgstr "Registreren"
 msgid "Check %s for information on how to sign up"
 msgstr "Bekijk %s voor meer informatie over hoe te registreren"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Ik"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%Hu%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%lu%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -166,7 +186,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i min geleden"
 msgstr[1] "%i min geleden"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Zojuist"
@@ -204,7 +224,7 @@ msgstr "Volgende"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Gesprek beginnen"
 
@@ -384,7 +404,7 @@ msgid "Conference Details"
 msgstr "Groepsgespreksgegevens"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Contactgegevens"
 
@@ -578,11 +598,11 @@ msgstr "Onversleuteld"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Modernen XMPP-chatcliënt"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -592,7 +612,7 @@ msgstr ""
 "eenvoudige en betrouwbare Jabber/XMPP-ervaring, met uw privacy in het "
 "achterhoofd."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -602,7 +622,7 @@ msgstr ""
 "toe privacygerelateerde functies, gelijk leesbevestigingen en typmeldingen, "
 "in te stellen."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -610,7 +630,7 @@ msgstr ""
 "Dino haalt de geschiedenis op van de server en synchroniseert berichten met "
 "andere apparaten."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Hoofdvenster met gesprekken"
 
diff --git a/main/po/pl.po b/main/po/pl.po
index 1d5e8046..3342fbd6 100644
--- a/main/po/pl.po
+++ b/main/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-25 09:34+0000\n"
 "Last-Translator: Michael K <kellermichal@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/dino/translations/"
@@ -20,21 +20,41 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Żądanie subskrypcji"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Odmów"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -131,35 +151,35 @@ msgstr "Zarejestruj"
 msgid "Check %s for information on how to sign up"
 msgstr "Sprawdź %s aby dowiedzieć się na temat rejestracji"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Ja"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Wczoraj"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -168,7 +188,7 @@ msgstr[0] "%i minuta temu"
 msgstr[1] "%i minuty temu"
 msgstr[2] "%i minut temu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Teraz"
@@ -206,7 +226,7 @@ msgstr "Następny"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Rozpocznij rozmowę"
 
@@ -388,7 +408,7 @@ msgid "Conference Details"
 msgstr "Szczegóły pokoju"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Szczegóły kontaktu"
 
@@ -580,11 +600,11 @@ msgstr "Nieszyfrowany"
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Nowoczesny klient Chatu XMPP"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -594,20 +614,20 @@ msgstr ""
 "komputery. Skupia się na prostej obsłudze Jabber/XMPP dbając o twoją "
 "prywatność."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Główne okno rozmów"
 
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 9cfecb3b..f867200c 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-10 03:24+0000\n"
 "Last-Translator: Rhagni Oliveira <rhagni@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/dino/"
@@ -18,21 +18,41 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Pedido de assinatura"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Aceitar"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Negar"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -129,35 +149,35 @@ msgstr "Registrar"
 msgid "Check %s for information on how to sign up"
 msgstr "Verifique %s para informação de como se inscrever"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -165,7 +185,7 @@ msgid_plural "%i mins ago"
 msgstr[0] "%i min atrás"
 msgstr[1] "%i min atrás"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Agora há pouco"
@@ -203,7 +223,7 @@ msgstr "Próximo"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Iniciar conversa"
 
@@ -383,7 +403,7 @@ msgid "Conference Details"
 msgstr "Detalhes da Conferência"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Detalhes do contato"
 
@@ -574,11 +594,11 @@ msgstr "Não-criptografado"
 msgid "Quit"
 msgstr "Sair"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Moderno cliente de chat XMPP"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -588,7 +608,7 @@ msgstr ""
 "uma transparente e confiável experiência Jabber/XMPP, tendo em mente a sua "
 "privacidade."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -598,7 +618,7 @@ msgstr ""
 "privacidade—características relacionadas às notificações de leitura, "
 "recebimento e escrita."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -606,7 +626,7 @@ msgstr ""
 "Dino obtém o histórico do servidor e sincroniza mensagens com outros "
 "dispositivos."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Janela principal com as conversas"
 
diff --git a/main/po/ro.po b/main/po/ro.po
index d8d59de8..d6563556 100644
--- a/main/po/ro.po
+++ b/main/po/ro.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
-"PO-Revision-Date: 2018-09-12 22:24+0000\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
+"PO-Revision-Date: 2018-10-25 07:38+0000\n"
 "Last-Translator: Licaon Kter <licaon.kter@protonmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/dino/"
 "translations/ro/>\n"
@@ -18,26 +18,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 3.2-dev\n"
+"X-Generator: Weblate 3.3-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Cerere de abonare"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Acceptă"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Refuză"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
-msgstr ""
+msgstr "Eroare la conectarea cu %s"
 
 #: main/src/ui/manage_accounts/dialog.vala:126
 #, c-format
@@ -131,35 +151,35 @@ msgstr "Înregistrează-te"
 msgid "Check %s for information on how to sign up"
 msgstr "Aflați pe %s informații despre cum se face înregistrarea"
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -168,7 +188,7 @@ msgstr[0] "Acum %i minut"
 msgstr[1] "Acum %i minute"
 msgstr[2] "Acum %i de minute"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Chiar acum"
@@ -206,7 +226,7 @@ msgstr "Următorul"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Pornește o conversație"
 
@@ -387,7 +407,7 @@ msgid "Conference Details"
 msgstr "Detalii conferință"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Detalii contact"
 
@@ -578,11 +598,11 @@ msgstr "Necriptat"
 msgid "Quit"
 msgstr "Ieșire"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
 msgstr "Client XMPP de discuții modern"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -592,7 +612,7 @@ msgstr ""
 "Se concentrează să furnizeze o experiență Jabber/XMPP clară și fiabilă, "
 "ținând cont de confidențialitatea dumneavoastră."
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -602,7 +622,7 @@ msgstr ""
 "și permite configurarea caracteristicilor legate de confidențialitate precum "
 "trimiterea notificărilor de primire și tastare."
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -610,7 +630,7 @@ msgstr ""
 "Dino preia istoricul discuțiilor de pe server și sincronizează mesajele cu "
 "celelalte dispozitive."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Fereastra principală de conversații"
 
diff --git a/main/po/ru.po b/main/po/ru.po
index a014f090..a728bcce 100644
--- a/main/po/ru.po
+++ b/main/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-07-01 09:42+0000\n"
 "Last-Translator: nvlgit <nvlbox@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/dino/"
@@ -20,21 +20,41 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.1-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "Требуется авторизация"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Принять"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Отклонить"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -131,35 +151,35 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "Я"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
@@ -168,7 +188,7 @@ msgstr[0] "%i минуту назад"
 msgstr[1] "%i минуты назад"
 msgstr[2] "%i минут назад"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "Только что"
@@ -206,7 +226,7 @@ msgstr "Следующее"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Начать чат"
 
@@ -388,7 +408,7 @@ msgid "Conference Details"
 msgstr "Информация о конференции"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "Информация о контакте"
 
@@ -579,26 +599,26 @@ msgstr "Не шифровать"
 msgid "Quit"
 msgstr "Выйти"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 #, fuzzy
 msgid "Modern XMPP Chat Client"
 msgstr "Современный XMPP-клиент"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
 "privacy in mind."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
 "notifications."
 msgstr ""
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
@@ -606,7 +626,7 @@ msgstr ""
 "Dino загружает историю с сервера и синхронизирует сообщения с другими "
 "устройствами."
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "Главное окно с чатами"
 
diff --git a/main/po/zh_Hans.po b/main/po/zh_Hans.po
index 2cf8f99c..22317a4d 100644
--- a/main/po/zh_Hans.po
+++ b/main/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-05-09 10:35+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -19,21 +19,41 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.0-dev\n"
 
-#: main/src/ui/notifications.vala:71
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "Image sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:66
+#: main/src/ui/conversation_selector/conversation_row.vala:145
+msgid "File sent"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "Image received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:68
+#: main/src/ui/conversation_selector/conversation_row.vala:147
+msgid "File received"
+msgstr ""
+
+#: main/src/ui/notifications.vala:87
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: main/src/ui/notifications.vala:77
+#: main/src/ui/notifications.vala:93
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "接受"
 
-#: main/src/ui/notifications.vala:78
+#: main/src/ui/notifications.vala:94
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "拒绝"
 
-#: main/src/ui/notifications.vala:84
+#: main/src/ui/notifications.vala:100
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -130,42 +150,42 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/groupchat_pm_row.vala:24
-#: main/src/ui/conversation_selector/chat_row.vala:30
+#: main/src/ui/conversation_selector/conversation_row.vala:131
+#: main/src/ui/conversation_selector/conversation_row.vala:141
 msgid "Me"
 msgstr "我"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:154
+#: main/src/ui/conversation_selector/conversation_row.vala:249
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%_m 月 %_d 日"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:158
+#: main/src/ui/conversation_selector/conversation_row.vala:253
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "昨天"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:161
+#: main/src/ui/conversation_selector/conversation_row.vala:256
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:162
+#: main/src/ui/conversation_selector/conversation_row.vala:257
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:165
+#: main/src/ui/conversation_selector/conversation_row.vala:260
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i 分钟以前"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:167
+#: main/src/ui/conversation_selector/conversation_row.vala:262
 #: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
 msgid "Just now"
 msgstr "刚刚"
@@ -203,7 +223,7 @@ msgstr "下一个"
 
 #: main/src/ui/add_conversation/select_contact_dialog.vala:85
 #: main/src/ui/unified_window.vala:242 main/data/menu_add.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:19
+#: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "开始聊天"
 
@@ -382,7 +402,7 @@ msgid "Conference Details"
 msgstr "聊天室详情"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
-#: main/data/im.dino.Dino.appdata.xml.in:23
+#: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
 msgstr "联系人详情"
 
@@ -573,12 +593,12 @@ msgstr "未加密"
 msgid "Quit"
 msgstr "退出"
 
-#: main/data/im.dino.Dino.appdata.xml.in:7
+#: main/data/im.dino.Dino.appdata.xml.in:8
 #, fuzzy
 msgid "Modern XMPP Chat Client"
 msgstr "现代 XMPP 客户端"
 
-#: main/data/im.dino.Dino.appdata.xml.in:9
+#: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
 "Dino is a modern open-source chat client for the desktop. It focuses on "
 "providing a clean and reliable Jabber/XMPP experience while having your "
@@ -587,7 +607,7 @@ msgstr ""
 "Dino 是一个现代的开源聊天桌面客户端。它致力于提供一个清爽又可靠的 Jabber/"
 "XMPP 体验，同时又保护您的隐私。"
 
-#: main/data/im.dino.Dino.appdata.xml.in:10
+#: main/data/im.dino.Dino.appdata.xml.in:11
 msgid ""
 "It supports end-to-end encryption with OMEMO and OpenPGP and allows "
 "configuring privacy-related features such as read receipts and typing "
@@ -596,13 +616,13 @@ msgstr ""
 "它支持 OMEMO 和 OpenPGP 端对端加密并允许配置隐私相关的特性比如已读回执和输入"
 "提醒。"
 
-#: main/data/im.dino.Dino.appdata.xml.in:11
+#: main/data/im.dino.Dino.appdata.xml.in:12
 msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr "Dino 从服务器获取消息并和其他设备同步。"
 
-#: main/data/im.dino.Dino.appdata.xml.in:15
+#: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
 msgstr "带有对话的主窗口"
 
diff --git a/plugins/omemo/po/ar.po b/plugins/omemo/po/ar.po
index cb7e0d1f..15c55586 100644
--- a/plugins/omemo/po/ar.po
+++ b/plugins/omemo/po/ar.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
-"PO-Revision-Date: 2018-10-23 17:22+0000\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
+"PO-Revision-Date: 2018-10-24 22:22+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/dino/plugin-omemo/"
 "ar/>\n"
@@ -20,9 +20,166 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 3.3-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "بصمتك الخاصة"
 
@@ -30,34 +187,69 @@ msgstr "بصمتك الخاصة"
 msgid "Will be generated on first connect"
 msgstr "سيتم توليدها عند أول اتصال"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "التشفير"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
-msgstr[0] ""
+msgstr[0] "%d جهاز"
 msgstr[1] "%d جهاز أوميمو"
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
+msgstr[2] "%d جهازي أوميمو"
+msgstr[3] "%d أجهزة أوميمو"
+msgstr[4] "%d جهاز أوميمو"
 msgstr[5] "%d أجهزة أوميمو"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "جهاز مجهول (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "مفاتيح أوميمو"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "أجهزة أخرى"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- لا شيء -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "جهاز مجهول (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "مفاتيح أوميمو"
+
+#~ msgid "Other devices"
+#~ msgstr "أجهزة أخرى"
+
+#~ msgid "- None -"
+#~ msgstr "- لا شيء -"
diff --git a/plugins/omemo/po/ca.po b/plugins/omemo/po/ca.po
index f974fce7..56018d7a 100644
--- a/plugins/omemo/po/ca.po
+++ b/plugins/omemo/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo 20180123\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-24 11:21+0100\n"
 "Last-Translator: Jordi Mallach <jordi@mallach.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -16,9 +16,166 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Emprempta pròpia"
 
@@ -26,30 +183,65 @@ msgstr "Emprempta pròpia"
 msgid "Will be generated on first connect"
 msgstr "Es generarà durant la primera connexió"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Xifratge"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d dispositiu OMEMO"
 msgstr[1] "%d dispositius OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Dispositiu desconegut (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Claus OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Altres dispositius"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Cap -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Dispositiu desconegut (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Claus OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Altres dispositius"
+
+#~ msgid "- None -"
+#~ msgstr "- Cap -"
diff --git a/plugins/omemo/po/de.po b/plugins/omemo/po/de.po
index de39ec53..a054997e 100644
--- a/plugins/omemo/po/de.po
+++ b/plugins/omemo/po/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-17 21:03+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/plugin-omemo/"
@@ -14,9 +14,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Eigener Fingerabdruck"
 
@@ -24,33 +181,68 @@ msgstr "Eigener Fingerabdruck"
 msgid "Will be generated on first connect"
 msgstr "Wird beim ersten Verbinden erzeugt"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d OMEMO Gerät"
 msgstr[1] "%d OMEMO Geräte"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Unbekanntes Gerät (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO Schlüssel"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andere Geräte"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Keine -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Unbekanntes Gerät (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO Schlüssel"
+
+#~ msgid "Other devices"
+#~ msgstr "Andere Geräte"
+
+#~ msgid "- None -"
+#~ msgstr "- Keine -"
 
 #~ msgid "OMEMO"
 #~ msgstr "OMEMO"
diff --git a/plugins/omemo/po/dino-omemo.pot b/plugins/omemo/po/dino-omemo.pot
index 3e96437a..e5b78475 100644
--- a/plugins/omemo/po/dino-omemo.pot
+++ b/plugins/omemo/po/dino-omemo.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,9 +18,166 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr ""
 
@@ -28,30 +185,53 @@ msgstr ""
 msgid "Will be generated on first connect"
 msgstr ""
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr ""
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
 msgstr ""
diff --git a/plugins/omemo/po/en.po b/plugins/omemo/po/en.po
index 0941effe..65f7dc66 100644
--- a/plugins/omemo/po/en.po
+++ b/plugins/omemo/po/en.po
@@ -2,15 +2,172 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr ""
 
@@ -18,30 +175,53 @@ msgstr ""
 msgid "Will be generated on first connect"
 msgstr ""
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr ""
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
 msgstr ""
diff --git a/plugins/omemo/po/es.po b/plugins/omemo/po/es.po
index 8f0b9b13..dd819c05 100644
--- a/plugins/omemo/po/es.po
+++ b/plugins/omemo/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-18 07:32+0000\n"
 "Last-Translator: sergio <srg.dev@posteo.net>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/dino/plugin-"
@@ -19,9 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Tu huella digital"
 
@@ -29,33 +186,68 @@ msgstr "Tu huella digital"
 msgid "Will be generated on first connect"
 msgstr "Será generada en la primera conexión"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d dispositivo OMEMO"
 msgstr[1] "%d dispositivos OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Dispositivo (0x%.8x) desconocido"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Huellas digitales OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Otros dispositivos"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Ninguno -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Dispositivo (0x%.8x) desconocido"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Huellas digitales OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Otros dispositivos"
+
+#~ msgid "- None -"
+#~ msgstr "- Ninguno -"
 
 #~ msgid "OMEMO"
 #~ msgstr "OMEMO"
diff --git a/plugins/omemo/po/eu.po b/plugins/omemo/po/eu.po
index 8475ff48..0753d5ad 100644
--- a/plugins/omemo/po/eu.po
+++ b/plugins/omemo/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-22 16:39+0000\n"
 "Last-Translator: Aitor Beriain <beriain@bitmessage.ch>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/dino/plugin-omemo/"
@@ -19,9 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Norberaren hatz marka"
 
@@ -29,30 +186,65 @@ msgstr "Norberaren hatz marka"
 msgid "Will be generated on first connect"
 msgstr "Lehen konexioan sortuko da"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "OMEMO gailu %d"
 msgstr[1] "%d OMEMO gailu"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Gailu ezezaguna (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO gakoak"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Beste gailuak"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Bat ere ez -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Gailu ezezaguna (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO gakoak"
+
+#~ msgid "Other devices"
+#~ msgstr "Beste gailuak"
+
+#~ msgid "- None -"
+#~ msgstr "- Bat ere ez -"
diff --git a/plugins/omemo/po/fr.po b/plugins/omemo/po/fr.po
index fa2a9554..aedcfb86 100644
--- a/plugins/omemo/po/fr.po
+++ b/plugins/omemo/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-10-22 04:29+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/plugin-omemo/"
@@ -18,9 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.3-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 #, fuzzy
 msgid "Own fingerprint"
 msgstr "Notre empreinte de clé"
@@ -29,30 +186,65 @@ msgstr "Notre empreinte de clé"
 msgid "Will be generated on first connect"
 msgstr "Sera généré lors de la première connexion"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d périphérique OMEMO"
 msgstr[1] "%d périphériques OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Périphérique inconnu (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Clés OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Autres périphériques"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Aucun -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Périphérique inconnu (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Clés OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Autres périphériques"
+
+#~ msgid "- None -"
+#~ msgstr "- Aucun -"
diff --git a/plugins/omemo/po/gl.po b/plugins/omemo/po/gl.po
index 4b87ef0a..6149cb6b 100644
--- a/plugins/omemo/po/gl.po
+++ b/plugins/omemo/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-29 03:26+0000\n"
 "Last-Translator: Xosé M <xosem@disroot.org>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/dino/plugin-"
@@ -19,9 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Pegada propia"
 
@@ -29,30 +186,65 @@ msgstr "Pegada propia"
 msgid "Will be generated on first connect"
 msgstr "Crearase na primeira conexión"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d dispositivo OMEMO"
 msgstr[1] "%d dispositivos OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Dispositivo descoñecido (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Chaves OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Outros dispositivos"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "-Nada-"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Dispositivo descoñecido (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Chaves OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Outros dispositivos"
+
+#~ msgid "- None -"
+#~ msgstr "-Nada-"
diff --git a/plugins/omemo/po/hu.po b/plugins/omemo/po/hu.po
index 6b9c3608..31265c7e 100644
--- a/plugins/omemo/po/hu.po
+++ b/plugins/omemo/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-08-31 08:36+0000\n"
 "Last-Translator: notramo <notramo@vipmail.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/dino/plugin-"
@@ -19,9 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.2-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Saját ujjlenyomat"
 
@@ -29,30 +186,65 @@ msgstr "Saját ujjlenyomat"
 msgid "Will be generated on first connect"
 msgstr "Az első csatlakozáskor lesz létrehozva"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d OMEMO eszköz"
 msgstr[1] "%d OMEMO eszköz"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Ismeretlen eszköz (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO kulcsok"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "További eszközök"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Nincs -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Ismeretlen eszköz (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO kulcsok"
+
+#~ msgid "Other devices"
+#~ msgstr "További eszközök"
+
+#~ msgid "- None -"
+#~ msgstr "- Nincs -"
diff --git a/plugins/omemo/po/it.po b/plugins/omemo/po/it.po
index 0cbb8940..e134ff8f 100644
--- a/plugins/omemo/po/it.po
+++ b/plugins/omemo/po/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-12-11 00:48+0000\n"
 "Last-Translator: M <d.pitrolo@gmx.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/dino/plugin-"
@@ -14,9 +14,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Propria impronta"
 
@@ -24,33 +181,68 @@ msgstr "Propria impronta"
 msgid "Will be generated on first connect"
 msgstr "Verrà generata alla prima connessione"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Crittografia"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d dispositivo OMEMO"
 msgstr[1] "%d dispositivi OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Dispositivo sconosciuto (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Chiavi OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Altri dispositivi"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Nessuno -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Dispositivo sconosciuto (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Chiavi OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Altri dispositivi"
+
+#~ msgid "- None -"
+#~ msgstr "- Nessuno -"
 
 #~ msgid "OMEMO"
 #~ msgstr "OMEMO"
diff --git a/plugins/omemo/po/lb.po b/plugins/omemo/po/lb.po
index 2cbafcac..c3d18694 100644
--- a/plugins/omemo/po/lb.po
+++ b/plugins/omemo/po/lb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-18 12:11+0000\n"
 "Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
 "Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino/"
@@ -14,9 +14,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Eegene Fangerofdrock"
 
@@ -24,33 +181,68 @@ msgstr "Eegene Fangerofdrock"
 msgid "Will be generated on first connect"
 msgstr "Gett bei der éischter Connectioun generéiert"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Verschlësselung"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d OMEMO Gerät"
 msgstr[1] "%d OMEMO Geräter"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Onbekannt Gerät (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO Schlësselen"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Aner Geräter"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Keng -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Onbekannt Gerät (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO Schlësselen"
+
+#~ msgid "Other devices"
+#~ msgstr "Aner Geräter"
+
+#~ msgid "- None -"
+#~ msgstr "- Keng -"
 
 #~ msgid "OMEMO"
 #~ msgstr "OMEMO"
diff --git a/plugins/omemo/po/nb.po b/plugins/omemo/po/nb.po
index 0c11c3c0..da5340c4 100644
--- a/plugins/omemo/po/nb.po
+++ b/plugins/omemo/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-18 00:21+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
@@ -19,9 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Eget fingeravtrykk"
 
@@ -29,33 +186,68 @@ msgstr "Eget fingeravtrykk"
 msgid "Will be generated on first connect"
 msgstr "Vil bli generert ved første tilkobling"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d OMEMO-enhet"
 msgstr[1] "%d OMEMO-enheter"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Ukjent enhet (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO-nøkler"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andre enheter"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Ingen -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Ukjent enhet (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO-nøkler"
+
+#~ msgid "Other devices"
+#~ msgstr "Andre enheter"
+
+#~ msgid "- None -"
+#~ msgstr "- Ingen -"
 
 #~ msgid "OMEMO"
 #~ msgstr "OMEMO"
diff --git a/plugins/omemo/po/nl.po b/plugins/omemo/po/nl.po
index b33d9d24..faa63bf4 100644
--- a/plugins/omemo/po/nl.po
+++ b/plugins/omemo/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-17 20:52+0000\n"
 "Last-Translator: Nathan Follens <nathan@email.is>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/dino/plugin-omemo/"
@@ -14,9 +14,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.18-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Eigen vingerafdruk"
 
@@ -24,33 +181,68 @@ msgstr "Eigen vingerafdruk"
 msgid "Will be generated on first connect"
 msgstr "Wordt bij eerste verbinding gegenereerd"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d OMEMO-apparaat"
 msgstr[1] "%d OMEMO-apparaten"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Onbekend apparaat (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO-sleutels"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andere apparaten"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Geen -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Onbekend apparaat (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO-sleutels"
+
+#~ msgid "Other devices"
+#~ msgstr "Andere apparaten"
+
+#~ msgid "- None -"
+#~ msgstr "- Geen -"
 
 #~ msgid "OMEMO"
 #~ msgstr "OMEMO"
diff --git a/plugins/omemo/po/nl_BE.po b/plugins/omemo/po/nl_BE.po
index 036439e7..bcd64c3c 100644
--- a/plugins/omemo/po/nl_BE.po
+++ b/plugins/omemo/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-06-18 12:37+0000\n"
 "Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: Flemish <https://hosted.weblate.org/projects/dino/plugin-"
@@ -19,9 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.0.1\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Eigen vingerafdruk"
 
@@ -29,30 +186,65 @@ msgstr "Eigen vingerafdruk"
 msgid "Will be generated on first connect"
 msgstr "Wordt bij de eerste verbinding gegenereerd"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d OMEMO-apparaat"
 msgstr[1] "%d OMEMO-apparaten"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Onbekend apparaat (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO-sleutels"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andere apparaten"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Geen -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Onbekend apparaat (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO-sleutels"
+
+#~ msgid "Other devices"
+#~ msgstr "Andere apparaten"
+
+#~ msgid "- None -"
+#~ msgstr "- Geen -"
diff --git a/plugins/omemo/po/pl.po b/plugins/omemo/po/pl.po
index 30882060..a9baf516 100644
--- a/plugins/omemo/po/pl.po
+++ b/plugins/omemo/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-31 18:58+0000\n"
 "Last-Translator: Andrzej Czerniak <andrzej.czerniak@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/dino/plugin-omemo/"
@@ -20,9 +20,166 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Własny odcisk klucza"
 
@@ -30,11 +187,11 @@ msgstr "Własny odcisk klucza"
 msgid "Will be generated on first connect"
 msgstr "Zostanie wygenerowany przy pierwszym połączeniu"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
@@ -42,19 +199,54 @@ msgstr[0] "%d Urządzenie OMEMO"
 msgstr[1] "%d Urządzenia OMEMO"
 msgstr[2] "%d Urządzeń OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Nieznane urządzenie (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Klucze OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Pozostałe urządzenia"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Wybierz -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Nieznane urządzenie (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Klucze OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Pozostałe urządzenia"
+
+#~ msgid "- None -"
+#~ msgstr "- Wybierz -"
diff --git a/plugins/omemo/po/ro.po b/plugins/omemo/po/ro.po
index 71afd33e..6b03ed91 100644
--- a/plugins/omemo/po/ro.po
+++ b/plugins/omemo/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-12 23:09+0000\n"
 "Last-Translator: Licaon Kter <licaon.kter@protonmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/dino/plugin-"
@@ -20,9 +20,166 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Amprentă proprie"
 
@@ -30,11 +187,11 @@ msgstr "Amprentă proprie"
 msgid "Will be generated on first connect"
 msgstr "Se va genera la prima conectare"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Criptare"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
@@ -42,19 +199,54 @@ msgstr[0] "%d dispozitiv OMEMO"
 msgstr[1] "%d dispozitive OMEMO"
 msgstr[2] "%d de dispozitive OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Dispozitiv necunoscut (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Chei OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Alte dispozitive"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Nici unul -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Dispozitiv necunoscut (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Chei OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Alte dispozitive"
+
+#~ msgid "- None -"
+#~ msgstr "- Nici unul -"
diff --git a/plugins/omemo/po/ru.po b/plugins/omemo/po/ru.po
index 41148209..d2176f16 100644
--- a/plugins/omemo/po/ru.po
+++ b/plugins/omemo/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-05-01 23:41+0000\n"
 "Last-Translator: Alexander <ilabdsf@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/dino/plugin-"
@@ -20,9 +20,166 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.0-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "Отпечаток этого устройства"
 
@@ -30,11 +187,11 @@ msgstr "Отпечаток этого устройства"
 msgid "Will be generated on first connect"
 msgstr "Будет сгенерирован при первом подключении"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
@@ -42,19 +199,54 @@ msgstr[0] "%d устройство OMEMO"
 msgstr[1] "%d устройства OMEMO"
 msgstr[2] "%d устройств OMEMO"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "Неизвестное устройство (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Ключи OMEMO"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Другие устройства"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Нет -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "Неизвестное устройство (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "Ключи OMEMO"
+
+#~ msgid "Other devices"
+#~ msgstr "Другие устройства"
+
+#~ msgid "- None -"
+#~ msgstr "- Нет -"
diff --git a/plugins/omemo/po/zh_Hans.po b/plugins/omemo/po/zh_Hans.po
index 7ae0560d..a75722c8 100644
--- a/plugins/omemo/po/zh_Hans.po
+++ b/plugins/omemo/po/zh_Hans.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-05-08 09:39+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -14,9 +14,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.0-dev\n"
 
+#: plugins/omemo/src/device_notification_populator.vala:74
+msgid "Manage"
+msgstr ""
+
+#: plugins/omemo/src/device_notification_populator.vala:84
+msgid "This contact has new devices"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:36
+msgid "OMEMO trust decision required"
+msgstr ""
+
+#: plugins/omemo/src/own_notifications.vala:38
+#, c-format
+msgid "Did you add a new device for account %s?"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:48
+msgid "Verify key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:49
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"highlighted accordingly in the chat window."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:59
+msgid "Fingerprints do not match"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:60
+#, c-format
+msgid ""
+"Please verify that you are comparing the correct fingerprint. If "
+"fingerprints do not match %s's account may be compromised and you should "
+"consider rejecting this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:70
+#: plugins/omemo/src/manage_key_dialog.vala:76
+#: plugins/omemo/data/manage_key_dialog.ui:13
+msgid "Cancel"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid "Verify Key Fingerprint"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:112
+msgid ""
+"Compare this key's fingerprint with the fingerprint displayed on the "
+"contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid "Reject Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:114
+msgid ""
+"Stop accepting this key during communication with its associated contact."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid "Accept Key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:116
+msgid ""
+"Start accepting this key during communication with its assoicated contact"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid "This key is currently %s."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+msgid "accepted"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:120
+#, c-format
+msgid "This means it can be used by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+msgid "verified"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:125
+#, c-format
+msgid ""
+"This means it can be used by %s to receive and send messages. Additionally "
+"it has been verified to match the key on the contact's device."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+msgid "rejected"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:129
+#, c-format
+msgid ""
+"This means it cannot be used by %s to receive messages, and any messages "
+"sent by it will be ignored"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:140
+msgid "Reject key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:141
+#, c-format
+msgid ""
+"Once confirmed, any future messages sent by %s using this key will be "
+"ignored and none of your messages will be readable using this key."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:148
+msgid "Accept key"
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:149
+#, c-format
+msgid ""
+"Once confirmed this key will be usable by %s to receive and send messages."
+msgstr ""
+
+#: plugins/omemo/src/manage_key_dialog.vala:155
+msgid "Back"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:50
+msgid ""
+"When you add new encryption keys to your account, automatically accept them."
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:113
+msgid "Accepted"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:118
+msgid "Rejected"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:123
+msgid "Verified"
+msgstr ""
+
+#: plugins/omemo/src/contact_details_dialog.vala:130
+msgid "Unused"
+msgstr ""
+
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
-#: plugins/omemo/data/account_settings_dialog.ui:19
 msgid "Own fingerprint"
 msgstr "自己的指纹"
 
@@ -24,32 +181,67 @@ msgstr "自己的指纹"
 msgid "Will be generated on first connect"
 msgstr "会在第一次连接时生成"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 msgid "Encryption"
 msgstr "加密"
 
-#: plugins/omemo/src/contact_details_provider.vala:31
+#: plugins/omemo/src/contact_details_provider.vala:42
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d 个 OMEMO 设备"
 
-#: plugins/omemo/src/account_settings_dialog.vala:35
-#, c-format
-msgid "Unknown device (0x%.8x)"
-msgstr "未知设备 (0x%.8x)"
+#: plugins/omemo/data/contact_details_dialog.ui:41
+msgid "Automatically accept new keys"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO 密钥"
+#: plugins/omemo/data/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "其他设备"
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- 无 -"
+#: plugins/omemo/data/contact_details_dialog.ui:180
+msgid "New keys"
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:216
+msgid "Associated keys"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:25
+msgid "Confirm"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:86
+msgid ""
+"Compare the fingerprint, character by character, with the one shown on your "
+"contacts device."
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
+msgstr ""
+
+#: plugins/omemo/data/manage_key_dialog.ui:120
+msgid "Matching"
+msgstr ""
+
+#~ msgid "Unknown device (0x%.8x)"
+#~ msgstr "未知设备 (0x%.8x)"
+
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO 密钥"
+
+#~ msgid "Other devices"
+#~ msgstr "其他设备"
+
+#~ msgid "- None -"
+#~ msgstr "- 无 -"
 
 #~ msgid "Database error"
 #~ msgstr "数据库错误"
diff --git a/plugins/omemo/src/own_notifications.vala b/plugins/omemo/src/own_notifications.vala
index 5c96f8d5..f882d03a 100644
--- a/plugins/omemo/src/own_notifications.vala
+++ b/plugins/omemo/src/own_notifications.vala
@@ -35,7 +35,7 @@ public class OwnNotifications {
     private void display_notification() {
         Notification notification = new Notification(_("OMEMO trust decision required"));
         notification.set_default_action_and_target_value("app.own-keys", new Variant.int32(account.id));
-        notification.set_body(_("Did you add a new device for account %s").printf(@"$(account.bare_jid.to_string())"));
+        notification.set_body(_("Did you add a new device for account %s?").printf(@"$(account.bare_jid.to_string())"));
         plugin.app.send_notification(account.id.to_string()+"-new-device", notification);
     }
 }
diff --git a/plugins/openpgp/po/ar.po b/plugins/openpgp/po/ar.po
index e6953e95..338ad826 100644
--- a/plugins/openpgp/po/ar.po
+++ b/plugins/openpgp/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-10-23 17:22+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/ca.po b/plugins/openpgp/po/ca.po
index 687bbae5..0330e745 100644
--- a/plugins/openpgp/po/ca.po
+++ b/plugins/openpgp/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-openpgp 20180123\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-24 11:24+0100\n"
 "Last-Translator: Jordi Mallach <jordi@mallach.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
diff --git a/plugins/openpgp/po/de.po b/plugins/openpgp/po/de.po
index f8a619b3..e48b2425 100644
--- a/plugins/openpgp/po/de.po
+++ b/plugins/openpgp/po/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-openpgp-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-24 12:15+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/dino-openpgp.pot b/plugins/openpgp/po/dino-openpgp.pot
index 9222f6e1..a542a0b4 100644
--- a/plugins/openpgp/po/dino-openpgp.pot
+++ b/plugins/openpgp/po/dino-openpgp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/openpgp/po/en.po b/plugins/openpgp/po/en.po
index 7a574d5e..3ff80be8 100644
--- a/plugins/openpgp/po/en.po
+++ b/plugins/openpgp/po/en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-openpgp-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/plugins/openpgp/po/es.po b/plugins/openpgp/po/es.po
index af1cc477..f3883dd7 100644
--- a/plugins/openpgp/po/es.po
+++ b/plugins/openpgp/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-04-13 21:39+0000\n"
 "Last-Translator: mgueji <miguejim@mailbox.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/eu.po b/plugins/openpgp/po/eu.po
index efb74cde..56c59e11 100644
--- a/plugins/openpgp/po/eu.po
+++ b/plugins/openpgp/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-04-03 15:27+0000\n"
 "Last-Translator: Aitor Beriain <beriain@bitmessage.ch>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/fr.po b/plugins/openpgp/po/fr.po
index d57fa7f3..198c9752 100644
--- a/plugins/openpgp/po/fr.po
+++ b/plugins/openpgp/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-24 12:13+0000\n"
 "Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/gl.po b/plugins/openpgp/po/gl.po
index eec550c7..e10ba657 100644
--- a/plugins/openpgp/po/gl.po
+++ b/plugins/openpgp/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-09-29 03:26+0000\n"
 "Last-Translator: Xosé M <xosem@disroot.org>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/hu.po b/plugins/openpgp/po/hu.po
index dcd7b951..5a4cb8c8 100644
--- a/plugins/openpgp/po/hu.po
+++ b/plugins/openpgp/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-08-31 08:38+0000\n"
 "Last-Translator: notramo <notramo@vipmail.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/it.po b/plugins/openpgp/po/it.po
index 20b21644..5eb063c2 100644
--- a/plugins/openpgp/po/it.po
+++ b/plugins/openpgp/po/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-openpgp-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-24 12:18+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/lb.po b/plugins/openpgp/po/lb.po
index d8ab6119..ee425091 100644
--- a/plugins/openpgp/po/lb.po
+++ b/plugins/openpgp/po/lb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-openpgp-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-24 12:20+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino/"
diff --git a/plugins/openpgp/po/nb.po b/plugins/openpgp/po/nb.po
index 905f19f1..843ea58d 100644
--- a/plugins/openpgp/po/nb.po
+++ b/plugins/openpgp/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-18 00:23+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
diff --git a/plugins/openpgp/po/nl.po b/plugins/openpgp/po/nl.po
index 9a05fa51..66798b6a 100644
--- a/plugins/openpgp/po/nl.po
+++ b/plugins/openpgp/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-openpgp-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2017-11-17 20:52+0000\n"
 "Last-Translator: Nathan Follens <nathan@email.is>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/nl_BE.po b/plugins/openpgp/po/nl_BE.po
index 7749eef1..05e55bfe 100644
--- a/plugins/openpgp/po/nl_BE.po
+++ b/plugins/openpgp/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-10-04 12:26+0000\n"
 "Last-Translator: woutersj <woutersj@gmail.com>\n"
 "Language-Team: Flemish <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/pl.po b/plugins/openpgp/po/pl.po
index daba9452..393d8fab 100644
--- a/plugins/openpgp/po/pl.po
+++ b/plugins/openpgp/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-30 19:02+0000\n"
 "Last-Translator: Andrzej Czerniak <andrzej.czerniak@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/ro.po b/plugins/openpgp/po/ro.po
index 55a5547a..15e9f9f2 100644
--- a/plugins/openpgp/po/ro.po
+++ b/plugins/openpgp/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-01-12 23:14+0000\n"
 "Last-Translator: Licaon Kter <licaon.kter@protonmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/ru.po b/plugins/openpgp/po/ru.po
index 092e6322..edb2e2cf 100644
--- a/plugins/openpgp/po/ru.po
+++ b/plugins/openpgp/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-03-23 18:26+0000\n"
 "Last-Translator: ethylmorphine <desilent@icloud.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/dino/plugin-"
diff --git a/plugins/openpgp/po/zh_Hans.po b/plugins/openpgp/po/zh_Hans.po
index 9c33bb10..6d0c9a56 100644
--- a/plugins/openpgp/po/zh_Hans.po
+++ b/plugins/openpgp/po/zh_Hans.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-23 23:56+0200\n"
+"POT-Creation-Date: 2018-11-10 17:37+0100\n"
 "PO-Revision-Date: 2018-05-08 09:42+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"