From 2e2141422526f62839d0ee397356d1e38b435b53 Mon Sep 17 00:00:00 2001
From: Translations <translations@dino.im>
Date: Sat, 10 Nov 2018 17:34:06 +0100
Subject: Update translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Arabic: ButterflyOfFire <ButterflyOfFire@protonmail.com>
Galician: Iván Seoane <ivanrsm1997@gmail.com>
Italian: Valerio Baldisserotto <svalo@libersoft.it>
Norwegian Bokmål: Allan Nordhøy <epost@anotheragency.no>
Romanian: Licaon Kter <licaon.kter@protonmail.com>
---
 plugins/omemo/po/ar.po                   | 236 ++++++++++++++++++++++++++++---
 plugins/omemo/po/ca.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/de.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/dino-omemo.pot          | 206 +++++++++++++++++++++++++--
 plugins/omemo/po/en.po                   | 206 +++++++++++++++++++++++++--
 plugins/omemo/po/es.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/eu.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/fr.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/gl.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/hu.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/it.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/lb.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/nb.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/nl.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/nl_BE.po                | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/pl.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/ro.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/ru.po                   | 226 ++++++++++++++++++++++++++---
 plugins/omemo/po/zh_Hans.po              | 226 ++++++++++++++++++++++++++---
 plugins/omemo/src/own_notifications.vala |   2 +-
 20 files changed, 3945 insertions(+), 321 deletions(-)

(limited to 'plugins/omemo')

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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "مفاتيح أوميمو"
+#~ msgid "OMEMO Keys"
+#~ msgstr "مفاتيح أوميمو"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "أجهزة أخرى"
+#~ msgid "Other devices"
+#~ msgstr "أجهزة أخرى"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Dispositiu desconegut (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Claus OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Claus OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Altres dispositius"
+#~ msgid "Other devices"
+#~ msgstr "Altres dispositius"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Cap -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Unbekanntes Gerät (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO Schlüssel"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO Schlüssel"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andere Geräte"
+#~ msgid "Other devices"
+#~ msgstr "Andere Geräte"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Keine -"
+#~ 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/contact_details_dialog.ui:89
+msgid "Own key"
+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/account_settings_dialog.ui:88
-msgid "Other devices"
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
+#: 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/contact_details_dialog.ui:89
+msgid "Own key"
+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/account_settings_dialog.ui:88
-msgid "Other devices"
+#: plugins/omemo/data/manage_key_dialog.ui:113
+msgid "Not Matching"
 msgstr ""
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
+#: 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Dispositivo (0x%.8x) desconocido"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Huellas digitales OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Huellas digitales OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Otros dispositivos"
+#~ msgid "Other devices"
+#~ msgstr "Otros dispositivos"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Ninguno -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Gailu ezezaguna (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO gakoak"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO gakoak"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Beste gailuak"
+#~ msgid "Other devices"
+#~ msgstr "Beste gailuak"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Bat ere ez -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Périphérique inconnu (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Clés OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Clés OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Autres périphériques"
+#~ msgid "Other devices"
+#~ msgstr "Autres périphériques"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Aucun -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Dispositivo descoñecido (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Chaves OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Chaves OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Outros dispositivos"
+#~ msgid "Other devices"
+#~ msgstr "Outros dispositivos"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "-Nada-"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Ismeretlen eszköz (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO kulcsok"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO kulcsok"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "További eszközök"
+#~ msgid "Other devices"
+#~ msgstr "További eszközök"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Nincs -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Dispositivo sconosciuto (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Chiavi OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Chiavi OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Altri dispositivi"
+#~ msgid "Other devices"
+#~ msgstr "Altri dispositivi"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Nessuno -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Onbekannt Gerät (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO Schlësselen"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO Schlësselen"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Aner Geräter"
+#~ msgid "Other devices"
+#~ msgstr "Aner Geräter"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Keng -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Ukjent enhet (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO-nøkler"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO-nøkler"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andre enheter"
+#~ msgid "Other devices"
+#~ msgstr "Andre enheter"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Ingen -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Onbekend apparaat (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO-sleutels"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO-sleutels"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andere apparaten"
+#~ msgid "Other devices"
+#~ msgstr "Andere apparaten"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Geen -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Onbekend apparaat (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO-sleutels"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO-sleutels"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Andere apparaten"
+#~ msgid "Other devices"
+#~ msgstr "Andere apparaten"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Geen -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Nieznane urządzenie (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Klucze OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Klucze OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Pozostałe urządzenia"
+#~ msgid "Other devices"
+#~ msgstr "Pozostałe urządzenia"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Wybierz -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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 "Dispozitiv necunoscut (0x%.8x)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Chei OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Chei OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Alte dispozitive"
+#~ msgid "Other devices"
+#~ msgstr "Alte dispozitive"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-msgstr "- Nici unul -"
+#~ 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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "Ключи OMEMO"
+#~ msgid "OMEMO Keys"
+#~ msgstr "Ключи OMEMO"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "Другие устройства"
+#~ msgid "Other devices"
+#~ msgstr "Другие устройства"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-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/contact_details_dialog.ui:54
+msgid ""
+"When this contact adds new encryption keys to their account, automatically "
+"accept them."
+msgstr ""
+
+#: plugins/omemo/data/contact_details_dialog.ui:89
+msgid "Own key"
+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)"
 
-#: plugins/omemo/data/account_settings_dialog.ui:5
-msgid "OMEMO Keys"
-msgstr "OMEMO 密钥"
+#~ msgid "OMEMO Keys"
+#~ msgstr "OMEMO 密钥"
 
-#: plugins/omemo/data/account_settings_dialog.ui:88
-msgid "Other devices"
-msgstr "其他设备"
+#~ msgid "Other devices"
+#~ msgstr "其他设备"
 
-#: plugins/omemo/data/account_settings_dialog.ui:112
-msgid "- None -"
-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);
     }
 }
-- 
cgit v1.2.3-70-g09d2