Merge branch 'master' into omemo-trust-ui

16 files changed, 31 insertions, 32 deletions

diff --git a/plugins/omemo/po/ca.po b/plugins/omemo/po/ca.po
index d50dd4c5..277a50da 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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"
diff --git a/plugins/omemo/po/de.po b/plugins/omemo/po/de.po
index 5e5e4c67..168cdc34 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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/"
diff --git a/plugins/omemo/po/dino-omemo.pot b/plugins/omemo/po/dino-omemo.pot
index 1e98b958..042e2d64 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/plugins/omemo/po/en.po b/plugins/omemo/po/en.po
index b93fe487..8c059c72 100644
--- a/plugins/omemo/po/en.po
+++ b/plugins/omemo/po/en.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/plugins/omemo/po/es.po b/plugins/omemo/po/es.po
index abba3d2a..45a6ed19 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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-"
diff --git a/plugins/omemo/po/eu.po b/plugins/omemo/po/eu.po
index 3edb5714..ce17cf87 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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/"
diff --git a/plugins/omemo/po/fr.po b/plugins/omemo/po/fr.po
index 4179ab9b..6b0b85be 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\n"
 "PO-Revision-Date: 2018-01-02 20:13+0000\n"
 "Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/plugin-omemo/"
diff --git a/plugins/omemo/po/it.po b/plugins/omemo/po/it.po
index b3f04657..fe5ff9b5 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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-"
diff --git a/plugins/omemo/po/lb.po b/plugins/omemo/po/lb.po
index 7de820f4..21190b6f 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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/"
diff --git a/plugins/omemo/po/nb.po b/plugins/omemo/po/nb.po
index c5dae8af..378916b7 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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/"
diff --git a/plugins/omemo/po/nl.po b/plugins/omemo/po/nl.po
index 35abebbd..ea893d5e 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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/"
diff --git a/plugins/omemo/po/nl_BE.po b/plugins/omemo/po/nl_BE.po
index 8f57cfbe..7194ed85 100644
--- a/plugins/omemo/po/nl_BE.po
+++ b/plugins/omemo/po/nl_BE.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-01 00:23+0200\n"
-"PO-Revision-Date: 2018-04-29 16:36+0000\n"
-"Last-Translator: Nathan Follens <nathan@email.is>\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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-"
 "omemo/nl_BE/>\n"
 "Language: nl_BE\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.0-dev\n"
+"X-Generator: Weblate 3.0.1\n"
 
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
@@ -27,7 +27,7 @@ msgstr "Eigen vingerafdruk"
 
 #: plugins/omemo/src/account_settings_widget.vala:42
 msgid "Will be generated on first connect"
-msgstr "Word bij d’eerste verbinding gegenereerd"
+msgstr "Wordt bij de eerste verbinding gegenereerd"
 
 #: plugins/omemo/src/contact_details_provider.vala:31
 msgid "Encryption"
diff --git a/plugins/omemo/po/pl.po b/plugins/omemo/po/pl.po
index 40c5d0b8..83de1c5b 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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/"
diff --git a/plugins/omemo/po/ro.po b/plugins/omemo/po/ro.po
index 4b2bf018..13b84630 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-05-01 00:23+0200\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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-"
diff --git a/plugins/omemo/po/ru.po b/plugins/omemo/po/ru.po
index 2f727c24..a89ed150 100644
--- a/plugins/omemo/po/ru.po
+++ b/plugins/omemo/po/ru.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-01 00:23+0200\n"
-"PO-Revision-Date: 2018-03-24 18:39+0000\n"
-"Last-Translator: ethylmorphine <desilent@icloud.com>\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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-"
 "omemo/ru/>\n"
 "Language: ru\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.20-dev\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
@@ -40,7 +40,7 @@ msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
 msgstr[0] "%d устройство OMEMO"
 msgstr[1] "%d устройства OMEMO"
-msgstr[2] ""
+msgstr[2] "%d устройств OMEMO"
 
 #: plugins/omemo/src/account_settings_dialog.vala:35
 #, c-format
diff --git a/plugins/omemo/po/zh_Hans.po b/plugins/omemo/po/zh_Hans.po
index e7f6d4e6..5557c861 100644
--- a/plugins/omemo/po/zh_Hans.po
+++ b/plugins/omemo/po/zh_Hans.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-omemo-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-01 00:23+0200\n"
-"PO-Revision-Date: 2018-04-11 15:35+0000\n"
-"Last-Translator: 朱陈锬 <201603748@stu.lzjtu.edu.cn>\n"
+"POT-Creation-Date: 2018-07-05 09:22-0600\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/"
 "dino/plugin-omemo/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.20\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: plugins/omemo/src/account_settings_widget.vala:42
 #: plugins/omemo/src/account_settings_widget.vala:45
@@ -26,14 +26,13 @@ msgstr "会在第一次连接时生成"
 
 #: plugins/omemo/src/contact_details_provider.vala:31
 msgid "Encryption"
-msgstr ""
+msgstr "加密"
 
 #: plugins/omemo/src/contact_details_provider.vala:31
 #, c-format
 msgid "%d OMEMO device"
 msgid_plural "%d OMEMO devices"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d 个 OMEMO 设备"
 
 #: plugins/omemo/src/account_settings_dialog.vala:35
 #, c-format
@@ -42,7 +41,7 @@ msgstr "未知设备 (0x%.8x)"
 
 #: plugins/omemo/data/account_settings_dialog.ui:5
 msgid "OMEMO Keys"
-msgstr ""
+msgstr "OMEMO 密钥"
 
 #: plugins/omemo/data/account_settings_dialog.ui:88
 msgid "Other devices"
@@ -50,7 +49,7 @@ msgstr "其他设备"
 
 #: plugins/omemo/data/account_settings_dialog.ui:112
 msgid "- None -"
-msgstr ""
+msgstr "- 无 -"
 
 #~ msgid "Database error"
 #~ msgstr "数据库错误"