aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libdino/src/service/message_storage.vala12
-rw-r--r--main/po/LINGUAS1
-rw-r--r--main/po/POTFILES.in78
-rw-r--r--main/po/de.po650
-rw-r--r--main/po/dino.pot325
-rw-r--r--main/po/en.po467
-rw-r--r--main/po/eo.po649
-rw-r--r--main/po/es.po662
-rw-r--r--main/po/eu.po657
-rw-r--r--main/po/fr.po649
-rw-r--r--main/po/it.po664
-rw-r--r--main/po/lb.po482
-rw-r--r--main/po/nb.po668
-rw-r--r--main/po/nl.po660
-rw-r--r--main/po/pt_BR.po631
-rw-r--r--main/po/zh_Hans.po648
-rw-r--r--plugins/omemo/po/LINGUAS2
-rw-r--r--plugins/omemo/po/POTFILES.in1
-rw-r--r--plugins/omemo/po/de.po53
-rw-r--r--plugins/omemo/po/dino-omemo.pot50
-rw-r--r--plugins/omemo/po/en.po45
-rw-r--r--plugins/omemo/po/es.po61
-rw-r--r--plugins/omemo/po/it.po60
-rw-r--r--plugins/omemo/po/lb.po58
-rw-r--r--plugins/omemo/po/nb.po61
-rw-r--r--plugins/omemo/po/nl.po57
-rw-r--r--plugins/omemo/po/zh_Hans.po50
-rw-r--r--plugins/omemo/src/contact_details_provider.vala2
-rw-r--r--plugins/openpgp/po/LINGUAS2
-rw-r--r--plugins/openpgp/po/POTFILES.in1
-rw-r--r--plugins/openpgp/po/de.po35
-rw-r--r--plugins/openpgp/po/dino-openpgp.pot38
-rw-r--r--plugins/openpgp/po/en.po42
-rw-r--r--plugins/openpgp/po/es.po55
-rw-r--r--plugins/openpgp/po/it.po44
-rw-r--r--plugins/openpgp/po/lb.po42
-rw-r--r--plugins/openpgp/po/nb.po58
-rw-r--r--plugins/openpgp/po/nl.po54
-rw-r--r--plugins/openpgp/po/zh_Hans.po61
-rw-r--r--plugins/openpgp/src/contact_details_provider.vala2
40 files changed, 5453 insertions, 3384 deletions
diff --git a/libdino/src/service/message_storage.vala b/libdino/src/service/message_storage.vala
index 76a8e60d..97873972 100644
--- a/libdino/src/service/message_storage.vala
+++ b/libdino/src/service/message_storage.vala
@@ -32,9 +32,11 @@ public class MessageStorage : StreamInteractionModule, Object {
public Gee.List<Message> get_messages(Conversation conversation, int count = 50) {
init_conversation(conversation);
Gee.List<Message> ret = new ArrayList<Message>(Message.equals_func);
- foreach (Message message in messages[conversation]) {
- if (ret.size >= count) break;
- ret.add(message);
+ BidirIterator<Message> iter = messages[conversation].bidir_iterator();
+ iter.last();
+ while (iter.valid && ret.size < count) {
+ iter.previous();
+ ret.insert(0, iter.get());
}
return ret;
}
@@ -42,7 +44,7 @@ public class MessageStorage : StreamInteractionModule, Object {
public Message? get_last_message(Conversation conversation) {
init_conversation(conversation);
if (messages[conversation].size > 0) {
- return messages[conversation].first();
+ return messages[conversation].last();
}
return null;
}
@@ -62,7 +64,7 @@ public class MessageStorage : StreamInteractionModule, Object {
private void init_conversation(Conversation conversation) {
if (!messages.has_key(conversation)) {
- messages[conversation] = new Gee.TreeSet<Message>((a, b) => { return -1 * a.local_time.compare(b.local_time); });
+ messages[conversation] = new Gee.TreeSet<Message>((a, b) => { return a.local_time.compare(b.local_time); });
Gee.List<Message> db_messages = db.get_messages(conversation.counterpart, conversation.account, Util.get_message_type_for_conversation(conversation), 50, null);
messages[conversation].add_all(db_messages);
}
diff --git a/main/po/LINGUAS b/main/po/LINGUAS
index 6cdc52d7..53d1974c 100644
--- a/main/po/LINGUAS
+++ b/main/po/LINGUAS
@@ -5,6 +5,7 @@ es
eu
fr
it
+lb
nb
nl
pt_BR
diff --git a/main/po/POTFILES.in b/main/po/POTFILES.in
deleted file mode 100644
index 10896f42..00000000
--- a/main/po/POTFILES.in
+++ /dev/null
@@ -1,78 +0,0 @@
-data/add_conversation/add_contact_dialog.ui
-data/add_conversation/add_groupchat_dialog.ui
-data/add_conversation/conference_details_fragment.ui
-data/add_conversation/list_row.ui
-data/add_conversation/select_jid_fragment.ui
-data/chat_input.ui
-data/contact_details_dialog.ui
-data/conversation_list_titlebar.ui
-data/conversation_selector/view.ui
-data/conversation_selector/chat_row_tooltip.ui
-data/conversation_selector/conversation_row.ui
-data/conversation_summary/image_toolbar.ui
-data/conversation_summary/message_item.ui
-data/conversation_summary/view.ui
-data/manage_accounts/account_row.ui
-data/manage_accounts/add_account_dialog.ui
-data/manage_accounts/dialog.ui
-data/menu_add.ui
-data/menu_app.ui
-data/menu_conversation.ui
-data/menu_encryption.ui
-data/occupant_list.ui
-data/occupant_list_item.ui
-data/settings_dialog.ui
-data/unified_window_placeholder.ui
-
-src/main.vala
-src/ui/application.vala
-src/ui/add_conversation/chat/add_contact_dialog.vala
-src/ui/add_conversation/chat/roster_list.vala
-src/ui/add_conversation/chat/dialog.vala
-src/ui/add_conversation/conference/add_groupchat_dialog.vala
-src/ui/add_conversation/conference/conference_details_fragment.vala
-src/ui/add_conversation/conference/conference_list.vala
-src/ui/add_conversation/conference/dialog.vala
-src/ui/add_conversation/accounts_combo_box.vala
-src/ui/add_conversation/list_row.vala
-src/ui/add_conversation/select_jid_fragment.vala
-src/ui/avatar_generator.vala
-src/ui/chat_input/edit_history.vala
-src/ui/chat_input/encryption_button.vala
-src/ui/chat_input/occupants_tab_completer.vala
-src/ui/chat_input/smiley_converter.vala
-src/ui/chat_input/view.vala
-src/ui/contact_details/settings_provider.vala
-src/ui/contact_details/dialog.vala
-src/ui/contact_details/muc_config_form_provider.vala
-src/ui/conversation_list_titlebar.vala
-src/ui/conversation_selector/chat_row.vala
-src/ui/conversation_selector/conversation_row.vala
-src/ui/conversation_selector/groupchat_pm_row.vala
-src/ui/conversation_selector/groupchat_row.vala
-src/ui/conversation_selector/list.vala
-src/ui/conversation_selector/view.vala
-src/ui/conversation_summary/chat_state_populator.vala
-src/ui/conversation_summary/conversation_item_skeleton.vala
-src/ui/conversation_summary/conversation_view.vala
-src/ui/conversation_summary/default_message_display.vala
-src/ui/conversation_summary/file_populator.vala
-src/ui/conversation_summary/image_display.vala
-src/ui/conversation_summary/message_populator.vala
-src/ui/conversation_summary/message_textview.vala
-src/ui/conversation_summary/slashme_message_display.vala
-src/ui/conversation_titlebar/file_entry.vala
-src/ui/conversation_titlebar/menu_entry.vala
-src/ui/conversation_titlebar/occupants_entry.vala
-src/ui/conversation_titlebar/view.vala
-src/ui/manage_accounts/account_row.vala
-src/ui/manage_accounts/add_account_dialog.vala
-src/ui/manage_accounts/dialog.vala
-src/ui/notifications.vala
-src/ui/occupant_menu/list.vala
-src/ui/occupant_menu/list_row.vala
-src/ui/occupant_menu/view.vala
-src/ui/settings_dialog.vala
-src/ui/unified_window.vala
-src/ui/util/helper.vala
-src/ui/util/label_hybrid.vala
diff --git a/main/po/de.po b/main/po/de.po
index 0bb02cfe..33175c66 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"PO-Revision-Date: 2017-09-06 22:45+0000\n"
"Language-Team: German <https://hosted.weblate.org/projects/dino/translations/"
"de/>\n"
@@ -13,414 +13,472 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.17-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Kontaktanfrage"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Annehmen"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Ablehnen"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Kontaktbild auswählen"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Auswählen"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Abbrechen"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr "Bilder"
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Konto"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr "Alle Dateien"
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Alias"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr "Verbinden…"
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Online-Status erfragen"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Verbunden"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Spitzname"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Nicht verbunden"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Passwort"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Passwort falsch"
+
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Fehler"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Beim Start beitreten"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Konto hinzufügen"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Suchen"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr "Ich"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Speichern"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%d. %b"
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Lokaler Alias"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Gestern"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Konten"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Keine Konten aktiv"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Konto hinzufügen"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "vor %i min"
+msgstr[1] "vor %i min"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Chat starten"
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Gerade eben"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Konferenz beitreten"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Einstellungen"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Beitreten"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Beenden"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Hinzufügen"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Kontaktdetails"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Speichern"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Unverschlüsselt"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Weiter"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Einstellungen"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Chat starten"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Sende Tippbenachrichtigungen"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr "Starten"
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Sende Lesebestätigung"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr ""
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Smileys zu Emojis umwandeln"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Beitreten"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr ""
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-msgid "Start"
-msgstr "Starten"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr ""
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Weiter"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Benachrichtigungen"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokale Einstellungen"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "An"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Keine Konten aktiv"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "Aus"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Konten verwalten"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Nur bei Erwähnung"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Keine Unterhaltung aktiv"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-msgid "Default: %s"
-msgstr "Standard: %s"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "tippt gerade..."
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "hat aufgehört zu tippen"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Nachricht zu lang"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d. %b, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d. %b, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
-#: src/ui/contact_details/dialog.vala:37
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Eigentümer"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrator"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Mitglied"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Gast"
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Einladen"
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Zur Konferenz einladen"
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Private Unterhaltung beginnen"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Hinauswerfen"
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
msgstr "Konferenzdetails"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
+msgstr "Kontaktdetails"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Name des Raums"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Beschreibung des Raums"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Dauerhaft"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
-msgstr "Der Raum bleibt bestehen nachdem alle Benutzer ihn verlassen haben"
+msgstr ""
+"Der Raum bleibt erhalten, nachdem der letzte Benutzer ihn verlassen hat"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Öffentlich sichtbar"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Nutzer können das Thema ändern"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
-msgstr "Echte JIDs erfahren"
+msgstr "Echte JIDs finden"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
-msgstr "Wer erfährt echte JIDs?"
+msgstr "Wer kann echte JIDs sehen?"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Passwort"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr "Passwort zum Betreten des Raums. Leer bedeutet keins"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Moderiert"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "Nur Nutzer mit Stimme können Nachrichten senden"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Ausschließlich Mitglieder"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Nur Mitglieder dürfen den Raum betreten"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Chatverlauf"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Anzahl der für diesen Raum gespeicherten Nachrichten"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Raum Konfiguration"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
msgstr ""
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%d. %b"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Gestern"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Tippbenachrichtigungen senden"
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Lesebestätigung senden"
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Benachrichtigungen"
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "vor %i min"
-msgstr[1] "vor %i min"
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokale Einstellungen"
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "Gerade eben"
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "An"
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "tippt gerade..."
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Aus"
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "hat aufgehört zu tippen"
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Nur bei Erwähnung"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr "Standard: %s"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Einstellungen"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d. %b, %H∶%M"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d. %b, %l∶%M %p"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smileys zu Emojis umwandeln"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Konten"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Lokaler Alias"
-#: src/ui/conversation_summary/message_textview.vala:33
-msgid "Message too long"
-msgstr "Nachricht zu lang"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr "Keine Konten konfiguriert"
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
msgstr "Konto hinzufügen"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Kontaktbild auswählen"
-
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Auswählen"
-
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
-
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
-msgstr ""
-
-#: src/ui/manage_accounts/dialog.vala:224
-msgid "Connecting…"
-msgstr "Verbinden…"
-
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Verbunden"
-
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Nicht verbunden"
-
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Passwort falsch"
-
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Fehler"
-
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Kontaktanfrage"
-
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Annehmen"
-
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Ablehnen"
-
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Eigentümer"
-
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Administrator"
-
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Mitglied"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Unverschlüsselt"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Gast"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Beenden"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr "Einladen"
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Suchen"
-#: src/ui/occupant_menu/view.vala:34
-msgid "Invite to Conference"
-msgstr "Zur Konferenz einladen"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Konto"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Private Unterhaltung beginnen"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Spitzname"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
-msgstr "Herauswerfen"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
+msgstr ""
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Keine Konten aktiv"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Alias"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Konten verwalten"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Online-Status erfragen"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Keine Unterhaltung aktiv"
+#~ msgid "Join on startup"
+#~ msgstr "Beim Start beitreten"
#~ msgid "Add Chat"
#~ msgstr "Chat hinzufügen"
diff --git a/main/po/dino.pot b/main/po/dino.pot
index f4cdc091..5aba5b75 100644
--- a/main/po/dino.pot
+++ b/main/po/dino.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"POT-Creation-Date: 2017-11-18 19:28+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,411 +18,466 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../data/add_conversation/add_contact_dialog.ui:11
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../src/ui/application.vala:41 ../src/ui/manage_accounts/dialog.vala:155
msgid "Cancel"
msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
+#: ../data/add_conversation/add_contact_dialog.ui:23
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
msgid "Add"
msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
+#: ../data/add_conversation/add_contact_dialog.ui:48
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/conference_details_fragment.ui:19
msgid "Account"
msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
+#: ../data/add_conversation/add_contact_dialog.ui:101
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
msgid "Alias"
msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:129
+#: ../data/add_conversation/add_contact_dialog.ui:129
msgid "Request presence updates"
msgstr ""
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+#: ../data/add_conversation/conference_details_fragment.ui:123
msgid "Nick"
msgstr ""
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/manage_accounts/dialog.ui:166
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
msgid "Password"
msgstr ""
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
msgstr ""
-#: data/conversation_selector/view.ui:14
+#: ../data/conversation_selector/view.ui:14
msgid "Search"
msgstr ""
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+#: ../data/manage_accounts/add_account_dialog.ui:21
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
msgid "Save"
msgstr ""
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+#: ../data/manage_accounts/dialog.ui:196
msgid "Local alias"
msgstr ""
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
msgid "Accounts"
msgstr ""
-#: data/manage_accounts/dialog.ui:251
+#: ../data/manage_accounts/dialog.ui:251
msgid "No accounts configured"
msgstr ""
-#: data/manage_accounts/dialog.ui:262
+#: ../data/manage_accounts/dialog.ui:262
msgid "Add an account"
msgstr ""
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
+#: ../data/menu_add.ui:6
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146
msgid "Start Chat"
msgstr ""
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../data/menu_add.ui:12
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/application.vala:41 ../src/ui/unified_window.vala:147
msgid "Join Conference"
msgstr ""
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
+#: ../data/menu_app.ui:10 ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30
msgid "Settings"
msgstr ""
-#: data/menu_app.ui:16
+#: ../data/menu_app.ui:16
msgid "Quit"
msgstr ""
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
+#: ../data/menu_conversation.ui:6 ../src/ui/contact_details/dialog.vala:37
msgid "Contact Details"
msgstr ""
-#: data/menu_encryption.ui:14
+#: ../data/menu_encryption.ui:14
msgid "Unencrypted"
msgstr ""
-#: data/settings_dialog.ui:7
+#: ../data/settings_dialog.ui:7
msgid "Preferences"
msgstr ""
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+#: ../src/ui/contact_details/settings_provider.vala:22
msgid "Send typing notifications"
msgstr ""
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+#: ../src/ui/contact_details/settings_provider.vala:25
msgid "Send message marker"
msgstr ""
-#: data/settings_dialog.ui:46
+#: ../data/settings_dialog.ui:46
msgid "Notify when a new message arrives"
msgstr ""
-#: data/settings_dialog.ui:58
+#: ../data/settings_dialog.ui:58
msgid "Convert smileys to emojis"
msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr ""
+
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+#: ../src/ui/application.vala:41
msgid "Join"
msgstr ""
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-msgid "Start"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining…"
msgstr ""
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, c-format
-msgid "Default: %s"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
+
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr ""
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
msgstr ""
-#: src/ui/contact_details/dialog.vala:37
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:63
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr ""
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: ../src/ui/conversation_selector/chat_row.vala:30
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
msgid "Me"
msgstr ""
-#: src/ui/conversation_selector/conversation_row.vala:172
+#: ../src/ui/conversation_selector/conversation_row.vala:169
#, no-c-format
msgid "%b %d"
msgstr ""
-#: src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_selector/conversation_row.vala:173
msgid "Yesterday"
msgstr ""
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
#, no-c-format
msgid "%H∶%M"
msgstr ""
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
#, no-c-format
msgid "%l∶%M %p"
msgstr ""
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
#, c-format
msgid "%i min ago"
msgid_plural "%i mins ago"
msgstr[0] ""
msgstr[1] ""
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
msgid "Just now"
msgstr ""
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing…"
msgstr ""
-#: src/ui/conversation_summary/chat_state_populator.vala:60
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
msgid "has stopped typing"
msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
#, no-c-format
msgid "%x, %H∶%M"
msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
#, no-c-format
msgid "%x, %l∶%M %p"
msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
#, no-c-format
msgid "%b %d, %H∶%M"
msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
#, no-c-format
msgid "%b %d, %l∶%M %p"
msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
#, no-c-format
msgid "%a, %H∶%M"
msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
#, no-c-format
msgid "%a, %l∶%M %p"
msgstr ""
-#: src/ui/conversation_summary/message_textview.vala:33
+#: ../src/ui/conversation_summary/message_textview.vala:33
msgid "Message too long"
msgstr ""
-#: src/ui/manage_accounts/add_account_dialog.vala:21
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
msgid "Add Account"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:150
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
msgid "Select avatar"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/manage_accounts/dialog.vala:155
msgid "Select"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:159
+#: ../src/ui/manage_accounts/dialog.vala:163
msgid "Images"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:162
+#: ../src/ui/manage_accounts/dialog.vala:166
msgid "All files"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:224
+#: ../src/ui/manage_accounts/dialog.vala:228
msgid "Connecting…"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:226
+#: ../src/ui/manage_accounts/dialog.vala:230
msgid "Connected"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:228
+#: ../src/ui/manage_accounts/dialog.vala:232
msgid "Disconnected"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:237
+#: ../src/ui/manage_accounts/dialog.vala:241
msgid "Wrong password"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
msgid "Error"
msgstr ""
-#: src/ui/notifications.vala:103
+#: ../src/ui/notifications.vala:105
msgid "Subscription request"
msgstr ""
-#: src/ui/notifications.vala:107
+#: ../src/ui/notifications.vala:111
msgid "Accept"
msgstr ""
-#: src/ui/notifications.vala:108
+#: ../src/ui/notifications.vala:112
msgid "Deny"
msgstr ""
-#: src/ui/occupant_menu/list.vala:107
+#: ../src/ui/occupant_menu/list.vala:105
msgid "Owner"
msgstr ""
-#: src/ui/occupant_menu/list.vala:109
+#: ../src/ui/occupant_menu/list.vala:107
msgid "Admin"
msgstr ""
-#: src/ui/occupant_menu/list.vala:111
+#: ../src/ui/occupant_menu/list.vala:109
msgid "Member"
msgstr ""
-#: src/ui/occupant_menu/list.vala:113
+#: ../src/ui/occupant_menu/list.vala:111
msgid "User"
msgstr ""
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
msgid "Invite"
msgstr ""
-#: src/ui/occupant_menu/view.vala:34
+#: ../src/ui/occupant_menu/view.vala:34
msgid "Invite to Conference"
msgstr ""
-#: src/ui/occupant_menu/view.vala:84
+#: ../src/ui/occupant_menu/view.vala:84
msgid "Start private conversation"
msgstr ""
-#: src/ui/occupant_menu/view.vala:92
+#: ../src/ui/occupant_menu/view.vala:92
msgid "Kick"
msgstr ""
-#: src/ui/unified_window.vala:141
+#: ../src/ui/unified_window.vala:137
msgid "No accounts active"
msgstr ""
-#: src/ui/unified_window.vala:142
+#: ../src/ui/unified_window.vala:138
msgid "Manage accounts"
msgstr ""
-#: src/ui/unified_window.vala:149
+#: ../src/ui/unified_window.vala:145
msgid "No conversation active"
msgstr ""
diff --git a/main/po/en.po b/main/po/en.po
index 0f223e2b..59a62d94 100644
--- a/main/po/en.po
+++ b/main/po/en.po
@@ -2,8 +2,471 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n" \ No newline at end of file
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr ""
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr ""
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
+msgid "Cancel"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr ""
+
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr ""
+
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr ""
+
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr ""
+
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr ""
+
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr ""
+
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr ""
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+msgid "Join Conference"
+msgstr ""
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr ""
+
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr ""
+
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr ""
+
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr ""
+
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr ""
+
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr ""
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
+
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr ""
+
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr ""
+
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr ""
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr ""
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr ""
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr ""
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr ""
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr ""
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr ""
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37
+msgid "Conference Details"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+msgid "Name of the room"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+msgid "Description of the room"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+msgid "Persistent"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+msgid "The room will persist after the last occupant exits"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+msgid "Publicly searchable"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+msgid "Occupants may change subject"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+msgid "Discover real JIDs"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+msgid "Who may discover real JIDs?"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+msgid "Password required to enter the room. Leave empty for none"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+msgid "Moderated"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+msgid "Only occupants with voice may send messages"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Members only"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+msgid "Only members may enter the room"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "Message history"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+msgid "Maximum number of history messages returned by the room"
+msgstr ""
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+msgid "Room Configuration"
+msgstr ""
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr ""
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr ""
+
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr ""
+
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr ""
+
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
+
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr ""
+
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr ""
+
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr ""
+
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr ""
+
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr ""
+
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr ""
+
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr ""
+
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr ""
+
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr ""
+
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr ""
+
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
+msgstr ""
+
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr ""
+
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr ""
diff --git a/main/po/eo.po b/main/po/eo.po
index 0f10df97..2b40ddee 100644
--- a/main/po/eo.po
+++ b/main/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"PO-Revision-Date: 2017-06-19 20:29+0000\n"
"Last-Translator: Tirifto <tirifto@posteo.cz>\n"
"Language-Team: Esperanto <https://hosted.weblate.org/projects/dino/"
@@ -19,422 +19,471 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.15-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Abona peto"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Akcepti"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Rifuzi"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Elekti profilbildon"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Elekti"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Nuligi"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Aldoni"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Konto"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Kaŝnomo"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Peti sciigojn pri ĉeesto"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Konektita"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Kaŝnomo"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Malkonektita"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Pasvorto"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Malĝusta pasvorto"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Aliĝi je lanĉo"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Eraro"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Serĉi"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Aldoni Konton"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Konservi"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr ""
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Loka kaŝnomo"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Kontoj"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Hieraŭ"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Neniuj aktivaj kontoj"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Aldoni konton"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Ekbabili"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "Antaŭ %i minuto"
+msgstr[1] "Antaŭ %i minutoj"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Ĵus"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Aliĝi al Kunveno"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Agordoj"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Aliĝi"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Ĉesi"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Aldoni"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Kontaktaj Detaloj"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Konservi"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Neĉifrita"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Sekva"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Preferoj"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Ekbabili"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Sciigi pri tajpado"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr ""
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Sendi mesaĝmarkilon"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Sciigi pri envenaj mesaĝoj"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr ""
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Grafikigi tekstajn mienetojn"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Aliĝi"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr ""
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "Ekbabili"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr ""
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Sekva"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Sciigoj"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokaj Agordoj"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "Ek"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Neniuj aktivaj kontoj"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "For"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Administri kontojn"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Nur menciite"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Neniu aktiva interparolo"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "Implicita"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "tajpas…"
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "ĉesis tajpi"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Posedanto"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administranto"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Ano"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Uzanto"
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Komenci privatan interparolon"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Kontaktaj Detaloj"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Nomo de la ĉambro"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Priskribo de la ĉambro"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Daŭra"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr "La ĉambro daŭros post eliro de la lasta ĉeestinto"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Publike serĉebla"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Ĉeestantoj rajtas ŝanĝi temon"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "Eltrovi verajn JID-ojn"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "Kiu rajtas eltrovi verajn JID-ojn?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Pasvorto"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr ""
-"Pasvorto necesa por eniri la ĉambron. Lasu malplenan por neniu pasvorto"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Kontrolata"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Nur anoj"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Nur anoj rajtas eniri la ĉambron"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Mesaĝa historio"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Maksimuma nombro da historiaj mesaĝoj donotaj de la ĉambro"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Ĉambraj Agordoj"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Hieraŭ"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "Antaŭ %i minuto"
-msgstr[1] "Antaŭ %i minutoj"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "Ĵus"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "tajpas…"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "ĉesis tajpi"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Agordoj"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Sciigi pri tajpado"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Sendi mesaĝmarkilon"
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "Mesaĝa historio"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Sciigoj"
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Aldoni Konton"
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokaj Agordoj"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Elekti profilbildon"
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Ek"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Elekti"
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "For"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Nur menciite"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Konektata…"
-
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Konektita"
-
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Malkonektita"
-
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Malĝusta pasvorto"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Preferoj"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Eraro"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Sciigi pri envenaj mesaĝoj"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Abona peto"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Grafikigi tekstajn mienetojn"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Akcepti"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Kontoj"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Rifuzi"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Loka kaŝnomo"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Posedanto"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr ""
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Administranto"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Aldoni konton"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Ano"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Neĉifrita"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Uzanto"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Ĉesi"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Serĉi"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Aliĝi al Kunveno"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Konto"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Komenci privatan interparolon"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Kaŝnomo"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
msgstr ""
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Neniuj aktivaj kontoj"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Kaŝnomo"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Administri kontojn"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Peti sciigojn pri ĉeesto"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Neniu aktiva interparolo"
+#~ msgid "Join on startup"
+#~ msgstr "Aliĝi je lanĉo"
#~ msgid "Add Chat"
#~ msgstr "Aldoni Babilon"
diff --git a/main/po/es.po b/main/po/es.po
index 1c8d752b..071021f5 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -7,435 +7,487 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
-"PO-Revision-Date: 2017-08-13 17:59+0000\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-18 07:21+0000\n"
"Last-Translator: sergio <srg.dev@posteo.net>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/dino/"
-"translations/es/>\n"
+"Language-Team: Spanish "
+"<https://hosted.weblate.org/projects/dino/translations/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.16\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Solicitud de suscripción"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Aceptar"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Denegar"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "¿Eliminar cuenta %s?"
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Seleccionar imagen de perfil"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Cancelar"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Añadir"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr "Imágenes"
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Cuenta"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr "Todos los ficheros"
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Alias"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr "Conectando…"
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Solicitar actualizaciones de presencia"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Conectado"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Apodo"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Desconectado"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Contraseña"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Contraseña incorrecta"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Unirse al inicio"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Error"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Buscar"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Añadir Cuenta"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Guardar"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr "Yo"
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Alias local"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Cuentas"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Ayer"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "No hay cuentas activas"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Añadir una cuenta"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Iniciar Conversación"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "hace %i min"
+msgstr[1] "hace %i mins"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Ahora"
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Unirse a Conversación en grupo"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Ajustes"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Unirse"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Salir"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Añadir"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Detalles del contacto"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Guardar"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Sin cifrar"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Siguiente"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Preferencias"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Iniciar Conversación"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Enviar notificaciones cuando escribes"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr "Iniciar Conversación"
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Enviar confirmación al recibir y al leer los mensajes"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr "Uniéndose..."
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notificar cuando llega un nuevo mensaje"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr "Contraseña requerida para entrar en la conversación en grupo"
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Convertir smileys en emojis"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr "Tu entrada ha sido prohibida o no puedes crear la conversación en grupo"
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Unirse"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr "La conversación en grupo no existe"
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "Iniciar Conversación"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr "No está permitido crear la conversación en grupo"
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Siguiente"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr "La conversación es solo para miembros"
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Notificaciones"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr "Elige un alias diferente"
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Ajustes"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr "La conversación tiene demasiados ocupantes"
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "Sí"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "No hay cuentas activas"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "No"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Gestionar cuentas"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Solo cuando te mencionan en la conversación"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "No hay conversaciones activa"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "Por defecto"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "está escribiendo..."
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "ha dejado de escribir"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Mensaje demasiado largo"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Propietario"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrador"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Miembro"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Usuario"
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Invitar a Conversación en grupo"
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Iniciar conversación privada"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Expulsar"
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr "Detalles de la Conversación"
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Detalles del contacto"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Nombre de la conversación en grupo"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Descripción de la conversación en grupo"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Conversación permanente"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr "La conversación en grupo no se eliminará aunque no haya participantes"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Conversación pública"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Los ocupantes pueden cambiar el asunto de la conversación"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "Descubrir JIDs reales"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "¿Quién puede ver los JIDs reales?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr ""
"Contraseña requerida para entrar en la conversación en grupo. Dejar vacío "
-"para no requerir contraseña"
+"para ninguna"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Conversación moderada"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "Solo los participantes con voz pueden enviar mensajes"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Conversación privada solo para miembros"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Solo los miembros pueden entrar en la conversación en grupo"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Histórico de mensajes"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Número máximo de mensajes que se almacenan en servidor"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Configuración de la conversación en grupo"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "hace %i min"
-msgstr[1] "hace %i mins"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "Ahora"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "está escribiendo..."
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "ha dejado de escribir"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Ajustes"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Bloquear"
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "Histórico de mensajes"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Las comunicaciones y las actualizaciones de presencia están bloqueadas"
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Añadir Cuenta"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Enviar notificaciones cuando escribes"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Seleccionar imagen de perfil"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Enviar confirmación al recibir y al leer los mensajes"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Seleccionar"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Notificaciones"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Ajustes locales"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Sí"
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Conectando..."
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "No"
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Conectado"
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Solo cuando te mencionan en la conversación"
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Desconectado"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr "Por defecto: %s"
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Contraseña incorrecta"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Preferencias"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Error"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notificar cuando llega un nuevo mensaje"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Solicitud de suscripción"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Convertir smileys en emojis"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Aceptar"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Cuentas"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Denegar"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Alias local"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Propietario"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr "No hay cuentas activas"
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Administrador"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Añadir una cuenta"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Miembro"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Sin cifrar"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Usuario"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Salir"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Buscar"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Unirse a Conversación en grupo"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Cuenta"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Iniciar conversación privada"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Alias"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
msgstr ""
+"Esto es una notificación de la aplicación. Haz click en el botón para "
+"descartar"
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "No hay cuentas activas"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Alias"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Gestionar cuentas"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Solicitar actualizaciones de presencia"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "No hay conversación activa"
+#~ msgid "Join on startup"
+#~ msgstr "Unirse al inicio"
#~ msgid "Add Chat"
#~ msgstr "Añadir conversación"
diff --git a/main/po/eu.po b/main/po/eu.po
index 1dfe2790..dab816ea 100644
--- a/main/po/eu.po
+++ b/main/po/eu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
-"PO-Revision-Date: 2017-09-15 16:45+0000\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-09 15:44+0000\n"
"Last-Translator: Aitor Beriain <beriain@bitmessage.ch>\n"
"Language-Team: Basque <https://hosted.weblate.org/projects/dino/translations/"
"eu/>\n"
@@ -17,423 +17,474 @@ 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 2.17-dev\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Harpidetzaren eskaera"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Onartu"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Ukatu"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Irudia hautatu"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Hautatu"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Utzi"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Gehitu"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr "Irudiak"
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Kontuak"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr "Fitxategi guztiak"
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Ezizena"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr "Konektatzen…"
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Presentzia eguneraketak eskatu"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Konektatuta"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Ezizena"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Ez konektatuta"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Pasahitza"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Pasahitz okerra"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Hasieran batu"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Akatsa"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Bilatu"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Kontua gehitu"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Gorde"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr "Ni"
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Bertako ezizena"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr ""
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Kontuak"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Atzo"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Ez dago kontu aktiborik"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Kontu bat gehitu"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr ""
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Berriketa hasi"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "orain dela min %i"
+msgstr[1] "orain dela %i min"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Orain"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Konferentziara batu"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Ezarpenak"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Batu"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Irten"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Gehitu"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Kontaktuaren xehetasunak"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Gorde"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Enkriptatu gabe"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Hurrengoa"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Hobespenak"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Berriketa hasi"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Idazte jakinarazpenak bidali"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr "Hasi"
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Mezu marka bidali"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Mezu berri bat heltzerakoan jakinarazi"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr ""
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Irrifartxoak emotikono bihurtu"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Batu"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr ""
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "Berriketa hasi"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr ""
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Hurrengoa"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Jakinarazpenak"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Bertako ezarpenak"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "Piztuta"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Ez dago kontu aktiborik"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "Itzalita"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Kontuak kudeatu"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Soilik aipatua izaterakoan"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Ez dago solasaldi aktiborik"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "Lehenetsia"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "idazten ari da..."
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "idazteari utzi dio"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Mezu luzeegia"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr ""
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Jabea"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administratzailea"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Kidea"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Erabiltzailea"
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Gonbidatu"
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Konferentziara gonbidatu"
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Solasaldi pribatua hasi"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Kanporatu"
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr "Konferentziaren xehetasunak"
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Kontaktuaren xehetasunak"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Gelaren izena"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Gelaren deskribapena"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Iraunkorra"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr "Gelak iraun egingo du azken okupatzailea irten ondoren"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Publikoki bilagarria"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Okupatzaileek gaia alda dezakete"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "Egiazko JIDak ikusi"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "Nork ikus ditzake egiazko JIDak?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Pasahitza"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
-msgstr "Gelan sartzeko pasahitza. Utzi zuriz pasahitzik ez ezartzeko"
+msgstr ""
+"Gelan sartzeko beharrezko pasahitza. Utzi zuriz pasahitzik ez ezartzeko"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Moderatua"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "Ahotsa duten okupatzaileek soilik bidali dezakete mezuak"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Kideak soilik"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Kideak soilik sar daitezke gelara"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Mezuen historia"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Gelak itzuliko dituen gehienezko historiako mezuak"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Gelaren konfigurazioa"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, fuzzy, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Atzo"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, fuzzy, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, fuzzy, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "orain dela min %i"
-msgstr[1] "orain dela %i min"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "Orain"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "idazten ari da..."
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "idazteari utzi dio"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, fuzzy, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, fuzzy, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, fuzzy, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, fuzzy, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, fuzzy, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Ezarpenak"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, fuzzy, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "Mezuen historia"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Kontua gehitu"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Idazte jakinarazpenak bidali"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Irudia hautatu"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Mezu marka bidali"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Hautatu"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Jakinarazpenak"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Bertako ezarpenak"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Piztuta"
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Konektatzen..."
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Itzalita"
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Konektatuta"
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Soilik aipatua izaterakoan"
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Ez konektatuta"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr "Lehenetsia: %s"
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Pasahitz okerra"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Hobespenak"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Akatsa"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Mezu berri bat heltzerakoan jakinarazi"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Harpidetzaren eskaera"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Irrifartxoak emotikono bihurtu"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Onartu"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Kontuak"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Ukatu"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Bertako ezizena"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Jabea"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr "Ez dago konfiguratutako konturik"
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Administratzailea"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Kontu bat gehitu"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Kidea"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Enkriptatu gabe"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Erabiltzailea"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Irten"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Bilatu"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Konferentziara batu"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Kontuak"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Solasaldi pribatua hasi"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Ezizena"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
msgstr ""
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Ez dago kontu aktiborik"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Ezizena"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Kontuak kudeatu"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Presentzia eguneraketak eskatu"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Ez dago solasaldi aktiborik"
+#~ msgid "Join on startup"
+#~ msgstr "Hasieran batu"
#~ msgid "Add Chat"
#~ msgstr "Berriketa gehitu"
diff --git a/main/po/fr.po b/main/po/fr.po
index 2f7b6e4c..752c0720 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"PO-Revision-Date: 2017-07-16 08:49+0000\n"
"Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
"Language-Team: French <https://hosted.weblate.org/projects/dino/translations/"
@@ -19,422 +19,471 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 2.16-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Demande d’abonnement"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Accepter"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Refuser"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Choisir un avatar"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Choisir"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Annuler"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Ajouter"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Compte"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Alias"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Demander les mises à jour de la présence"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Connecté"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Pseudo"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Déconnecté"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Mot de passe"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Mauvais mot de passe"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Rejoindre au démarrage"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Erreur"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Rechercher"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Ajouter un compte"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Sauver"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr ""
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Alias local"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Comptes"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Hier"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Aucun compte actif"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%Hh%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Ajouter un compte"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Commencer une discussion"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "Il y a %i minute"
+msgstr[1] "Il y a %i minutes"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "À l’instant"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Rejoindre une conférence"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Paramètres"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Rejoindre"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Quitter"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Ajouter"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Informations du contact"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Sauver"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non-chiffré"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Suivant"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Préférences"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Commencer une discussion"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Envoyer les notifications de frappe"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr ""
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Envoyer les marqueurs de message"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notifier l’arrivée de nouveaux messages"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr ""
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Convertir les smileys en émoticônes"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Rejoindre"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr ""
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "Commencer une discussion"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr ""
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Suivant"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Notifications"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Paramètres locaux"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "Activé"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Aucun compte actif"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "Désactivé"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Gérer les comptes"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Seulement quand mentionné"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Aucune discussion en cours"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "Par défaut"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "est en train d’écrire…"
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "a arrêté d’écrire"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %Hh%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %Hh%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %Hh%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Propriétaire"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrateur"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membre"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Utilisateur"
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Commencer une discussion privée"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Informations du contact"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Nom du salon"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Description du salon"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Persistant"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr "Ce salon persistera après le départ du dernier occupant"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Visible publiquement"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Les occupants peuvent changer le sujet"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "Découverte des vrais JID"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "Qui peut découvrir les vrais JID ?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr ""
-"Un mot de passe nécessaire pour accéder au salon. Laissez vide pour aucun"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Modéré"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "Seuls les membres ayant voix peu"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Seulement les membres"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Seuls les membres peuvent accéder au salon"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Historique des messages"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Nombre de messages d’historique retourné par le salon"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Configuration du salon"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Hier"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%Hh%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "Il y a %i minute"
-msgstr[1] "Il y a %i minutes"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "À l’instant"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "est en train d’écrire…"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "a arrêté d’écrire"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %Hh%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Paramètres"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %Hh%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %Hh%M"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Envoyer les notifications de frappe"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Envoyer les marqueurs de message"
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "Historique des messages"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Notifications"
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Ajouter un compte"
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Paramètres locaux"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Choisir un avatar"
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Activé"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Choisir"
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Désactivé"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Seulement quand mentionné"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Connexion…"
-
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Connecté"
-
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Déconnecté"
-
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Mauvais mot de passe"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Préférences"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Erreur"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notifier l’arrivée de nouveaux messages"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Demande d’abonnement"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Convertir les smileys en émoticônes"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Accepter"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Comptes"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Refuser"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Alias local"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Propriétaire"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr ""
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Administrateur"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Ajouter un compte"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Membre"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non-chiffré"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Utilisateur"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Quitter"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Rechercher"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Rejoindre une conférence"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Compte"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Commencer une discussion privée"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Pseudo"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
msgstr ""
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Aucun compte actif"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Alias"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Gérer les comptes"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Demander les mises à jour de la présence"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Aucune discussion en cours"
+#~ msgid "Join on startup"
+#~ msgstr "Rejoindre au démarrage"
#~ msgid "Add Chat"
#~ msgstr "Ajouter discussion"
diff --git a/main/po/it.po b/main/po/it.po
index 12f0eb73..3ca8bfc0 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -7,434 +7,488 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
-"PO-Revision-Date: 2017-08-28 07:33+0000\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-18 12:47+0000\n"
"Last-Translator: Valerio Baldisserotto <svalo@libersoft.it>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/dino/"
-"translations/it/>\n"
+"Language-Team: Italian "
+"<https://hosted.weblate.org/projects/dino/translations/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.17-dev\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Richiesta di sottoscrizione"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Accetta"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Rifiuta"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Rimuovere l' account %s?"
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Seleziona avatar"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Seleziona"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Annulla"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Aggiungi"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr "Immagini"
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Account"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr "Tutti i files"
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Alias"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr "Connessione…"
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Richiedi gli aggiornamenti di stato"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Connesso"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Soprannome"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Disconnesso"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Password"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Password errata"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Entra all'avvio"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Errore"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Cerca"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Aggiungi Account"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Salva"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr "Io"
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Alias locale"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Accounts"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Ieri"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Nessun account attivo"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Aggiungi un account"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Inizia una conversazione"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minuto fa"
+msgstr[1] "%i minuti fa"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Adesso"
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Entra in una conferenza"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Impostazioni"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Entra"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Esci"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Aggiungi"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Dettagli del contatto"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Salva"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Non cifrato"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Avanti"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Preferenze"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Inizia una conversazione"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Invia notifiche di digitazione"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr "Inizia"
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Invia lo stato del messaggio"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Notifica quando arriva un nuovo messaggio"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr "Una password è richiesta per entrare nella stanza"
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Converte smileys in emojis"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Entra"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr "La stanza non esiste"
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
#, fuzzy
-msgid "Start"
-msgstr "Inizia una conversazione"
+msgid "Not allowed to create room"
+msgstr "Non sei abilitata/o a creare stanze"
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Prossimo"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr "La stanza è solo per membri"
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Notifiche"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr "Scegli un soprannome differente"
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Impostazioni Locali"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+#, fuzzy
+msgid "Room has too many occupants"
+msgstr "La stanza ha troppi occupanti"
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "Sì"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Nessun account attivo"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "No"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Gestisci accounts"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Solo se menzionato"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Nessuna conversazione attiva"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "Default"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "sta scrivendo..."
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "ha smesso di scrivere"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Messaggio troppo lungo"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Proprietario"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Amministratore"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Membro"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Utente"
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Invita"
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Invita alla conferenza"
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Inizia una conversazione privata"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Espelli"
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr "Dettagli della conferenza"
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Dettagli del contatto"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Nome della stanza"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Descrizione della stanza"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Persistente"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr "La stanza continuerà ad esistere dopo l'uscita dell'ultimo occupante"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Ricercabile pubblicamente"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Gli occupanti possono cambiare il soggetto"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "Scopri i veri JIDs"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "Chi può scoprire i veri JIDs?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Password"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr ""
-"Password richiesta per entrare nella stanza. Lasciare vuoto per nessuna"
+"Password richiesta per entrare nella stanza. Lascia vuoto per non impostarla"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Moderata"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "Solo gli occupanti con voce possono mandare messaggi"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Solo per membri"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Solo i membri possono entrare nella stanza"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Cronologia dei messaggi"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Numero massimo di messaggi in cronologia restituiti dalla stanza"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Configurazione della stanza"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Ieri"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i minuto fa"
-msgstr[1] "%i minuti fa"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "Adesso"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "sta scrivendo..."
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "ha smesso di scrivere"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Impostazioni"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blocca"
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "Cronologia dei messaggi"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
+"La comunicazione e gli aggiornamenti di stato sono bloccati in entrambe le "
+"direzioni"
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Aggiungi Account"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Invia notifiche di digitazione"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Seleziona avatar"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Invia lo stato del messaggio"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Seleziona"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Notifiche"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Impostazioni Locali"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Sì"
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Connessione..."
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "No"
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Connesso"
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Solo se menzionato"
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Disconnesso"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr "Default: %s"
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Password errata"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Preferenze"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Errore"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Notifica quando arriva un nuovo messaggio"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Richiesta di sottoscrizione"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Converte smileys in emojis"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Accetta"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Accounts"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Rifiuta"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Alias locale"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Proprietario"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr "Nessun account configurato"
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Amministratore"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Aggiungi un account"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Membro"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non cifrato"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Utente"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Esci"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Cerca"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Entra in una conferenza"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Account"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Inizia una conversazione privata"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Soprannome"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
-msgstr ""
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
+msgstr "Questa è una notifica dell'app. Clicca il bottone per chiudere"
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Nessun account attivo"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Alias"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Gestisci accounts"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Richiedi gli aggiornamenti di stato"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Nessuna conversazione attiva"
+#~ msgid "Join on startup"
+#~ msgstr "Entra all'avvio"
#~ msgid "Add Chat"
#~ msgstr "Aggiungi conversazione"
diff --git a/main/po/lb.po b/main/po/lb.po
new file mode 100644
index 00000000..90abd7cf
--- /dev/null
+++ b/main/po/lb.po
@@ -0,0 +1,482 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Luxembourgish (Dino)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-10-28 21:59+0200\n"
+"PO-Revision-Date: 2017-11-18 16:43+0000\n"
+"Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
+"Language-Team: Luxembourgish "
+"<https://hosted.weblate.org/projects/dino/translations/lb/>\n"
+"Language: lb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
+
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Abonnement Ufro"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Akzeptéieren"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Verweigeren"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Konto %s läschen?"
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Läschen"
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Avatar auswielen"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Auswielen"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
+msgid "Cancel"
+msgstr "Ofbriechen"
+
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr "Biller"
+
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr "All Dateien"
+
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr "Verbannen…"
+
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Verbonnen"
+
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Getrennt"
+
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Falsch Passwuert"
+
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Feeler"
+
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Account bäisetzen"
+
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr "Ech"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Gëschter"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H:%M"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l:%M %p"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i Minutt hier"
+msgstr[1] "%i Minutten hier"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Just elo"
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
+msgid "Join Conference"
+msgstr "Konferenz bäitrieden"
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Bäitrieden"
+
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Bäisetzen"
+
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Späicheren"
+
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Nächst"
+
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Chat starten"
+
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr "Start"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining…"
+msgstr "Bäitrieden…"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr "Passwuert gëtt gebraucht fir de Raum ze betrieden"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr "Gebannt vum bäitrieden an erstelle vu Konferenzen"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr "Raum existéiert net"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr "Net erlaabt ee Raum ze erstellen"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr "Raum ass nëmme fir Memberen"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr "Wiel een anere Spëtznumm"
+
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr "De Raum huet ze vill Benotzer"
+
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Keng Kontoen aktiv"
+
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Kontoe managen"
+
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Keng Conversatiounen aktiv"
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing…"
+msgstr "tippt grad…"
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "huet opgehalen ze tippen"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Noriicht ze laang"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H:%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l:%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H:%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l:%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Besëtzer"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Administrateur"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Member"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Benotzer"
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Alueden"
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Invitéieren an Konferenz"
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Privat Conversatioun starten"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Erausgeheien"
+
+#: ../src/ui/contact_details/dialog.vala:37
+msgid "Conference Details"
+msgstr "Konferenz Detailer"
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
+msgstr "Kontaktdetailer"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
+msgid "Name of the room"
+msgstr "Numm vum Raum"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
+msgid "Description of the room"
+msgstr "Beschreiwung vum Raum"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
+msgid "Persistent"
+msgstr "Dauerhaft"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
+msgid "The room will persist after the last occupant exits"
+msgstr "De Raum bleift bestoen, nodeems de leschte Benotzer erausgaangen ass"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
+msgid "Publicly searchable"
+msgstr "Ëffentlech siichtbar"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
+msgid "Occupants may change subject"
+msgstr "Benotzer däerfe Sujet änneren"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
+msgid "Discover real JIDs"
+msgstr "Echt JIDs gesinn"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
+msgid "Who may discover real JIDs?"
+msgstr "Ween däerf echt JIDs gesinn?"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Passwuert"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
+msgid "Password required to enter the room. Leave empty for none"
+msgstr ""
+"Passwuert gëtt gebraucht fir de Raum ze betrieden. Eidel loosse fir kee "
+"Passwuert"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
+msgid "Moderated"
+msgstr "Moderéiert"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
+msgid "Only occupants with voice may send messages"
+msgstr "Nëmme Benotzer mat Stemm däerfe Messagë schécken"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Members only"
+msgstr "Nëmme fir Memberen"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
+msgid "Only members may enter the room"
+msgstr "Nëmme Memberen däerfen de Raum betrieden"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "Message history"
+msgstr "Messagen Historique"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
+msgid "Maximum number of history messages returned by the room"
+msgstr "Maximal Unzuel vum ale Messagen, déi vum Raum geschéckt ginn"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
+msgid "Room Configuration"
+msgstr "Raum Astellungen"
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Astellungen"
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blockéieren"
+
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Kommunikatioun a Status Updates sinn an all Richtung blockéiert"
+
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Tipp-Notifikatioune schécken"
+
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Message Marker verschécken"
+
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Notifikatiounen"
+
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokal Astellungen"
+
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Un"
+
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Aus"
+
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Nëmme wann erwäänt"
+
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr "Standard: %s"
+
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Astellungen"
+
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Benoriichtege wann een neie Message ukënnt"
+
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smileyen an Emojien konvertéieren"
+
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Kontoen"
+
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Lokalen Pseudonym"
+
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr "Keng Kontoe konfiguréiert"
+
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Ee Konto bäisetzen"
+
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onverschlësselt"
+
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Zoumaachen"
+
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Sichen"
+
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Konto"
+
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Spëtznumm"
+
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
+msgstr ""
+"Dat heiten ass eng App-Notifikatioun. Klick de Knäppche fir ze ewech ze "
+"maachen"
+
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Pseudonym"
+
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Presenz Updaten ufroen"
diff --git a/main/po/nb.po b/main/po/nb.po
index 14459cc3..82e95e46 100644
--- a/main/po/nb.po
+++ b/main/po/nb.po
@@ -7,435 +7,485 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
-"PO-Revision-Date: 2017-10-20 11:47+0000\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-18 00:19+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
-"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
-"translations/nb_NO/>\n"
-"Language: nb_NO\n"
+"Language-Team: Norwegian Bokmål "
+"<https://hosted.weblate.org/projects/dino/translations/nb/>\n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.17\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Abonnementsforespørsel"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Godta"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Nekt"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Fjern konto %s?"
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Velg avatar"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Velg"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Avbryt"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Legg til"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr "Bilder"
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Konto"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr "Alle filer"
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Alias"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr "Kobler til…"
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Forespør tilstedeværelsesoppdateringer"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Tilkoblet"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Kallenavn"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Frakoblet"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Passord"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Feil passord"
+
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Feil"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Ta del ved oppstart"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Legg til konto"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Søk"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr "Meg"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Lagre"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Lokalt alias"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "I går"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Kontoer"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Ingen kontoer aktive"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Legg til en konto"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i minutt siden"
+msgstr[1] "%i minutter siden"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Start sludring"
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Akkurat nå"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Ta del i konferanse"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Innstillinger"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Ta del"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Avslutt"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Legg til"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Kontaktdetaljer"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Lagre"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Ukryptert"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Neste"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Innstillinger"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Start sludring"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Send skrivevarsling"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr "Start"
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Send meldingsmarkør"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr "Tar del…"
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Varsle ved mottak av ny melding"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr "Passord kreves for å ta del i rommet"
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Konverter smilefjes til emoji-er"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr "Bannlyst fra å ta del i eller å opprette konferanser"
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Ta del"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr "Rommet finnes ikke"
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "Start sludring"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr "Ikke tillatt å opprette rom"
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Neste"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr "Rommet er kun for medlemmer"
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Merknader"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr "Velg et annet kallenavn"
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokale innstillinger"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr "Rommet har for mange deltagere"
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "På"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Ingen kontoer aktive"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "Av"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Behandle kontoer"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Bare når nevnt"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Ingen kontoer aktive"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "Forvalg"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr ""
+"Du kjenner blott blodets hvisken og benpipernes bøn fra det ubevisste "
+"sjeleliv…"
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "har tatt pause i skrivinga"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Meldingen er for land"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Eier"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Admin"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Medlem"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Bruker"
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Inviter"
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Inviter til konferanse"
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Start privat samtale"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Kast ut"
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr "Konferansedetaljer"
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Kontaktdetaljer"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Rommets navn"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Beskrivelse av rommet"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Vedvarende"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr "Rommet vil vedvare etter at siste deltager forlater"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Offentlig søkbart"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Deltagere kan endre emne"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "Oppdag ekte JID-er"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "Hvem har tilgang til oppdagelse av ekte JID-er?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Passord"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
-msgstr "Passord kreves for å ta del i rommet. La stå tomt for inget."
+msgstr "Passord kreves for å ta del i rommet. La stå tomt for inget"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Moderert"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "Bare deltagere med stemme kan sende meldinger"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Kun for medlemmer"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Kun medlemmer har adgang til rommet"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Meldingshistorikk"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Maksimalt antall meldinger med historikk som skal svares av rommet"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Rom-oppsett"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "I går"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i minutt siden"
-msgstr[1] "%i minutter siden"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr ""
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr ""
-"Du kjenner blott blodets hvisken og benpipernes bøn fra det ubevisste "
-"sjeleliv…"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "har tatt pause i skrivinga"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr ""
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr ""
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr ""
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr ""
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr ""
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Innstillinger"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr ""
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blokker"
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "Meldingshistorikk"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Kommunikasjon og statusoppdateringer i begge retninger er blokkert"
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Legg til konto"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Send skrivevarsling"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Velg avatar"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Send meldingsmarkør"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Velg"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Merknader"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokale innstillinger"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "På"
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Kobler til…"
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Av"
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Tilkoblet"
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Bare når nevnt"
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Frakoblet"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr "Forvalg: %s"
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Feil passord"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Innstillinger"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Feil"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Varsle ved mottak av ny melding"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Abonnementsforespørsel"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Konverter smilefjes til emoji-er"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Godta"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Kontoer"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Nekt"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Lokalt alias"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Eier"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr "Ingen kontoer satt opp"
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Admin"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Legg til en konto"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Medlem"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Ukryptert"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Bruker"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Avslutt"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Søk"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Ta del i konferanse"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Konto"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Start privat samtale"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Kallenavn"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
-msgstr ""
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
+msgstr "Dette er en merknad i programmet. Klikk på knappen for å avvise"
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Ingen kontoer aktive"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Alias"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Behandle kontoer"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Forespør tilstedeværelsesoppdateringer"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Ingen kontoer aktive"
+#~ msgid "Join on startup"
+#~ msgstr "Ta del ved oppstart"
#~ msgid "Add Chat"
#~ msgstr "Legg til sludring"
diff --git a/main/po/nl.po b/main/po/nl.po
index d521f818..11ca5475 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -7,436 +7,486 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
-"PO-Revision-Date: 2017-08-24 10:45+0000\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-17 20:58+0000\n"
"Last-Translator: Nathan Follens <nathan@email.is>\n"
-"Language-Team: Dutch <https://hosted.weblate.org/projects/dino/translations/"
-"nl/>\n"
+"Language-Team: Dutch "
+"<https://hosted.weblate.org/projects/dino/translations/nl/>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.17-dev\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Abonneringsverzoek"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Toestaan"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Afwijzen"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr "Account %s verwijderen?"
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Kies een avatar"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Selecteren"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Annuleren"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Toevoegen"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr "Afbeeldingen"
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Account"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr "Alle bestanden"
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Alias"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr "Verbinding maken…"
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Vraag om aanwezigheidsupdates"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Verbonden"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Schermnaam"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Verbinding verbroken"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Wachtwoord"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Verkeerd wachtwoord"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Deelnemen bij opstarten"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Fout"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Zoeken"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Account toevoegen"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Opslaan"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr "Ik"
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Lokale alias"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Accounts"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Gisteren"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Geen accounts actief"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Account toevoegen"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Gesprek beginnen"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min geleden"
+msgstr[1] "%i min geleden"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Zojuist"
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Deelnemen aan groepsgesprek"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Instellingen"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Deelnemen"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Afsluiten"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Toevoegen"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Contactgegevens"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Opslaan"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Onversleuteld"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Volgende"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Voorkeuren"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Gesprek beginnen"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "Aan-het-typen-meldingen sturen"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr "Beginnen"
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "Berichtmarkers sturen"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr "Deelnemen…"
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "Melding tonen bij nieuw bericht"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr "Wachtwoord voor groepsgesprek vereist"
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Smileys omzetten naar emoji's"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr "Deelnemen aan of aanmaken van groepsgesprekken verboden"
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Deelnemen"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr "Groepsgesprek bestaat niet"
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "Gesprek beginnen"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr "Aanmaken van groepsgesprek niet toegestaan"
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Volgende"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr "Groepsgesprek is alleen-leden"
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "Meldingen"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr "Kies een andere bijnaam"
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokale instellingen"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr "Groepsgesprek heeft te veel deelnemers"
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "Aan"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Geen accounts actief"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "Uit"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Accounts beheren"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "Enkel wanneer vermeld"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Geen gesprekken actief"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "Standaard"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "is aan het typen..."
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "is gestopt met typen"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr "Bericht te lang"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H:%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "Eigenaar"
+
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "Beheerder"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "Lid"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "Gebruiker"
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr "Uitnodigen"
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr "Uitnodigen in groepsgesprek"
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Privégesprek beginnen"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr "Schoppen"
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr "Groepsgespreksgegevens"
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Contactgegevens"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "Naam van groepsgesprek"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "Beschrijving van groepsgesprek"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "Blijvend"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr ""
"Het groepsgesprek blijft bestaan wanneer de laatste deelnemer het verlaat"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "Publiek vindbaar"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "Deelnemers kunnen onderwerp aanpassen"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "Zichtbaarheid van JID's"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "Wie mag de JID's van de deelnemers zien?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr ""
"Wachtwoord vereist om deel te nemen aan het groepsgesprek. Laat dit leeg als "
"je geen wachtwoord wil"
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "Gemodereerd"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "Enkel deelnemers met stem mogen berichten sturen"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "Enkel leden"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "Enkel leden mogen deelnemen aan het groepsgesprek"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "Berichtgeschiedenis"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "Maximaal aantal berichten uit geschiedenis dat groepsgesprek weergeeft"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "Gespreksconfiguratie"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%d %b"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Gisteren"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i min geleden"
-msgstr[1] "%i min geleden"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "Zojuist"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "is aan het typen..."
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "is gestopt met typen"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%d %b, %H:%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%d %b, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Instellingen"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr "Blokkeren"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "Berichtgeschiedenis"
-
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Account toevoegen"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "Aan-het-typen-meldingen sturen"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Kies een avatar"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "Berichtmarkers sturen"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Selecteren"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "Meldingen"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "Lokale instellingen"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "Aan"
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Verbinding maken..."
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "Uit"
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Verbonden"
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "Enkel wanneer vermeld"
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Verbinding verbroken"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr "Standaard: %s"
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Verkeerd wachtwoord"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Voorkeuren"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Fout"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Melding tonen bij nieuw bericht"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Abonneringsverzoek"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Smileys omzetten naar emoji's"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Toestaan"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Accounts"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Afwijzen"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Lokale alias"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "Eigenaar"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr "Geen accounts ingesteld"
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "Beheerder"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Account toevoegen"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "Lid"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onversleuteld"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "Gebruiker"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Afsluiten"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Zoeken"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Deelnemen aan groepsgesprek"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Account"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Privégesprek beginnen"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Schermnaam"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
-msgstr ""
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
+msgstr "Dit is een melding. Klik om te sluiten"
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Geen accounts actief"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Alias"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Accounts beheren"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Vraag om aanwezigheidsupdates"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Geen gesprekken actief"
+#~ msgid "Join on startup"
+#~ msgstr "Deelnemen bij opstarten"
#~ msgid "Add Chat"
#~ msgstr "Gesprek beginnen"
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 0df295f1..3e0312e5 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"PO-Revision-Date: 2017-04-29 22:51+0000\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -15,422 +15,471 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "Pedido de assinatura"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "Aceitar"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "Negar"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "Escolher avatar"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "Selecionar"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "Cancelar"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "Adicionar"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "Conta"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "Pseudônimo"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "Pedir atualizações sobre presença"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "Conectado"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "Apelido"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "Desconectado"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "Senha"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "Senha errada"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "Conectar-se ao inicializar"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "Erro"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "Pesquisar"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Adicionar conta"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "Salvar"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr ""
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "Pseudônimo local"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "Contas"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "Ontem"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "Nenhuma conta ativa"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "Adicionar conta"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "Iniciar bate-papo"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min atrás"
+msgstr[1] "%i min atrás"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "Agora há pouco"
+
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "Juntar-se a uma conferência"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "Configurações"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "Juntar-se"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "Sair"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "Adicionar"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "Detalhes do contato"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "Salvar"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "Não-criptografado"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "Próximo"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "Preferências"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Iniciar bate-papo"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-#, fuzzy
-msgid "Send typing notifications"
-msgstr "Enviar notificações quando digitando e marcador de mensagens"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr ""
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-#, fuzzy
-msgid "Send message marker"
-msgstr "Enviar notificações quando digitando e marcador de mensagens"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
msgstr ""
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "Converter smileys para emojis"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "Juntar-se"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr ""
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "Iniciar bate-papo"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr ""
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "Próximo"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:39
-#, fuzzy
-msgid "Local Settings"
-msgstr "Configurações"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "Nenhuma conta ativa"
+
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "Gerenciar contas"
+
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "Nenhuma conversa ativa"
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "está digitando..."
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "parou de digitar"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
msgstr ""
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, c-format
-msgid "Default: %s"
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr ""
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
msgstr ""
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "Iniciar conversa privada"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "Detalhes do contato"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:63
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "Senha"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr ""
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%b %d"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "Ontem"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i min atrás"
-msgstr[1] "%i min atrás"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "Agora há pouco"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "está digitando..."
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "parou de digitar"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%b %d, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%b %d, %l∶%M %p"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%a, %H∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "Configurações"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%a, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
-#: src/ui/conversation_summary/message_textview.vala:33
-msgid "Message too long"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
msgstr ""
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "Adicionar conta"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr ""
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "Escolher avatar"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr ""
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "Selecionar"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr ""
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "Conectando..."
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr ""
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "Conectado"
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr ""
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "Desconectado"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
+msgstr ""
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "Senha errada"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "Preferências"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "Erro"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr ""
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "Pedido de assinatura"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "Converter smileys para emojis"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "Aceitar"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Contas"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "Negar"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "Pseudônimo local"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
msgstr ""
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr ""
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "Adicionar conta"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr ""
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Não-criptografado"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr ""
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "Sair"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "Pesquisar"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "Juntar-se a uma conferência"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "Conta"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "Iniciar conversa privada"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "Apelido"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
msgstr ""
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "Nenhuma conta ativa"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "Pseudônimo"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "Gerenciar contas"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Pedir atualizações sobre presença"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "Nenhuma conversa ativa"
+#~ msgid "Join on startup"
+#~ msgstr "Conectar-se ao inicializar"
#~ msgid "Add Chat"
#~ msgstr "Adicionar bate-papo"
diff --git a/main/po/zh_Hans.po b/main/po/zh_Hans.po
index 1c01ffa3..1dcf8ba6 100644
--- a/main/po/zh_Hans.po
+++ b/main/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dino\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-23 00:48+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"PO-Revision-Date: 2017-06-01 10:32+0000\n"
"Last-Translator: tonghuix <tonghuix@gmail.com>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -19,420 +19,470 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.15-dev\n"
-#: data/add_conversation/add_contact_dialog.ui:11
-#: data/add_conversation/add_groupchat_dialog.ui:11 src/ui/application.vala:41
-#: src/ui/add_conversation/chat/dialog.vala:40
-#: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: ../src/ui/notifications.vala:105
+msgid "Subscription request"
+msgstr "订阅请求"
+
+#: ../src/ui/notifications.vala:111
+msgid "Accept"
+msgstr "接受"
+
+#: ../src/ui/notifications.vala:112
+msgid "Deny"
+msgstr "拒绝"
+
+#: ../src/ui/manage_accounts/dialog.vala:125
+#, c-format
+msgid "Remove account %s?"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:128
+msgid "Remove"
+msgstr ""
+
+#: ../src/ui/manage_accounts/dialog.vala:154
+msgid "Select avatar"
+msgstr "选择头像"
+
+#: ../src/ui/manage_accounts/dialog.vala:155
+msgid "Select"
+msgstr "选择"
+
+#: ../src/ui/manage_accounts/dialog.vala:155 ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:15
+#: ../src/ui/add_conversation/select_contact_dialog.vala:40
+#: ../data/add_conversation/add_groupchat_dialog.ui:11
+#: ../data/add_conversation/add_contact_dialog.ui:11
msgid "Cancel"
msgstr "取消"
-#: data/add_conversation/add_contact_dialog.ui:23
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
-msgid "Add"
-msgstr "添加"
+#: ../src/ui/manage_accounts/dialog.vala:163
+msgid "Images"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:48
-#: data/add_conversation/add_groupchat_dialog.ui:49
-#: data/add_conversation/conference_details_fragment.ui:16
-msgid "Account"
-msgstr "账号"
+#: ../src/ui/manage_accounts/dialog.vala:166
+msgid "All files"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:101
-#: data/add_conversation/add_groupchat_dialog.ui:189
-msgid "Alias"
-msgstr "别名"
+#: ../src/ui/manage_accounts/dialog.vala:228
+msgid "Connecting…"
+msgstr ""
-#: data/add_conversation/add_contact_dialog.ui:129
-msgid "Request presence updates"
-msgstr "请求在线更新"
+#: ../src/ui/manage_accounts/dialog.vala:230
+msgid "Connected"
+msgstr "已连接"
-#: data/add_conversation/add_groupchat_dialog.ui:120
-#: data/add_conversation/conference_details_fragment.ui:120
-msgid "Nick"
-msgstr "昵称"
+#: ../src/ui/manage_accounts/dialog.vala:232
+msgid "Disconnected"
+msgstr "已断开连接"
-#: data/add_conversation/add_groupchat_dialog.ui:147
-#: data/add_conversation/conference_details_fragment.ui:172
-#: data/manage_accounts/add_account_dialog.ui:73
-#: data/manage_accounts/dialog.ui:166
-#: src/ui/contact_details/muc_config_form_provider.vala:62
-msgid "Password"
-msgstr "密码"
+#: ../src/ui/manage_accounts/dialog.vala:241
+msgid "Wrong password"
+msgstr "密码错误"
-#: data/add_conversation/add_groupchat_dialog.ui:176
-msgid "Join on startup"
-msgstr "启动时加入"
+#: ../src/ui/manage_accounts/dialog.vala:244
+#: ../src/ui/manage_accounts/dialog.vala:246
+msgid "Error"
+msgstr "错误"
-#: data/conversation_selector/view.ui:14
-msgid "Search"
-msgstr "搜索"
+#: ../src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "添加帐号"
-#: data/manage_accounts/add_account_dialog.ui:21
-#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
-msgid "Save"
-msgstr "保存"
+#: ../src/ui/conversation_selector/groupchat_pm_row.vala:25
+#: ../src/ui/conversation_selector/chat_row.vala:30
+msgid "Me"
+msgstr ""
-#: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:196
-msgid "Local alias"
-msgstr "本地别名"
+#: ../src/ui/conversation_selector/conversation_row.vala:169
+#, no-c-format
+msgid "%b %d"
+msgstr "%_m 月 %_d 日"
-#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
-msgid "Accounts"
-msgstr "帐号"
+#: ../src/ui/conversation_selector/conversation_row.vala:173
+msgid "Yesterday"
+msgstr "昨天"
-#: data/manage_accounts/dialog.ui:251
-#, fuzzy
-msgid "No accounts configured"
-msgstr "没有激活的帐号"
+#: ../src/ui/conversation_selector/conversation_row.vala:176
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:146
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
-#: data/manage_accounts/dialog.ui:262
-msgid "Add an account"
-msgstr "添加新账号"
+#: ../src/ui/conversation_selector/conversation_row.vala:177
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:147
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
-#: data/menu_add.ui:6 src/ui/application.vala:70
-#: src/ui/conversation_list_titlebar.vala:31 src/ui/unified_window.vala:150
-msgid "Start Chat"
-msgstr "开始聊天"
+#: ../src/ui/conversation_selector/conversation_row.vala:180
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:151
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分钟以前"
+
+#: ../src/ui/conversation_selector/conversation_row.vala:182
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:153
+msgid "Just now"
+msgstr "刚刚"
-#: data/menu_add.ui:12 src/ui/application.vala:41
-#: src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:151
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:26
+#: ../src/ui/unified_window.vala:147 ../data/menu_add.ui:12
msgid "Join Conference"
msgstr "加入群聊"
-#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:22
-#: src/ui/contact_details/settings_provider.vala:25
-#: src/ui/contact_details/settings_provider.vala:30
-msgid "Settings"
-msgstr "设置"
+#: ../src/ui/application.vala:41
+#: ../src/ui/add_conversation/add_conference_dialog.vala:62
+#: ../src/ui/add_conversation/conference_details_fragment.vala:133
+msgid "Join"
+msgstr "加入"
-#: data/menu_app.ui:16
-msgid "Quit"
-msgstr "退出"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:27
+#: ../data/add_conversation/add_contact_dialog.ui:23
+msgid "Add"
+msgstr "添加"
-#: data/menu_conversation.ui:6 src/ui/contact_details/dialog.vala:37
-msgid "Contact Details"
-msgstr "联系人详情"
+#: ../src/ui/add_conversation/add_groupchat_dialog.vala:41
+#: ../data/manage_accounts/add_account_dialog.ui:21
+msgid "Save"
+msgstr "保存"
-#: data/menu_encryption.ui:14
-msgid "Unencrypted"
-msgstr "未加密"
+#: ../src/ui/add_conversation/add_conference_dialog.vala:47
+msgid "Next"
+msgstr "下一个"
-#: data/settings_dialog.ui:7
-msgid "Preferences"
-msgstr "选项"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:84
+#: ../src/ui/unified_window.vala:146 ../data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "开始聊天"
-#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:22
-msgid "Send typing notifications"
-msgstr "发送打字通知"
+#: ../src/ui/add_conversation/select_contact_dialog.vala:85
+msgid "Start"
+msgstr ""
-#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:25
-msgid "Send message marker"
-msgstr "发送消息标记"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:105
+msgid "Joining..."
+msgstr ""
-#: data/settings_dialog.ui:46
-msgid "Notify when a new message arrives"
-msgstr "新消息到达时通知"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:138
+msgid "Password required to enter room"
+msgstr ""
-#: data/settings_dialog.ui:58
-msgid "Convert smileys to emojis"
-msgstr "将笑脸转换成 Emoji"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:143
+msgid "Banned from joining or creating conference"
+msgstr ""
-#: src/ui/application.vala:41 src/ui/add_conversation/conference/dialog.vala:60
-msgid "Join"
-msgstr "加入"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:145
+msgid "Room does not exist"
+msgstr ""
-#: src/ui/application.vala:71 src/ui/conversation_list_titlebar.vala:32
-#, fuzzy
-msgid "Start"
-msgstr "开始聊天"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:147
+msgid "Not allowed to create room"
+msgstr ""
-#: src/ui/add_conversation/conference/dialog.vala:45
-msgid "Next"
-msgstr "下一个"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:149
+msgid "Room is members only"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:30
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Notifications"
-msgstr "通知"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:152
+msgid "Choose a different nick"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "本地设置"
+#: ../src/ui/add_conversation/conference_details_fragment.vala:154
+msgid "Room has too many occupants"
+msgstr ""
-#: src/ui/contact_details/settings_provider.vala:74
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:116
-msgid "On"
-msgstr "开启"
+#: ../src/ui/unified_window.vala:137
+msgid "No accounts active"
+msgstr "没有激活的帐号"
-#: src/ui/contact_details/settings_provider.vala:76
-#: src/ui/contact_details/settings_provider.vala:114
-#: src/ui/contact_details/settings_provider.vala:117
-msgid "Off"
-msgstr "关闭"
+#: ../src/ui/unified_window.vala:138
+msgid "Manage accounts"
+msgstr "管理帐号"
-#: src/ui/contact_details/settings_provider.vala:78
-msgid "Only when mentioned"
-msgstr "只有被提到时"
+#: ../src/ui/unified_window.vala:145
+msgid "No conversation active"
+msgstr "没有激活的会话"
-#: src/ui/contact_details/settings_provider.vala:80
-#: src/ui/contact_details/settings_provider.vala:115
-#, fuzzy, c-format
-msgid "Default: %s"
-msgstr "默认"
+#: ../src/ui/conversation_summary/chat_state_populator.vala:57
+msgid "is typing..."
+msgstr "正在输入..."
+
+#: ../src/ui/conversation_summary/chat_state_populator.vala:59
+msgid "has stopped typing"
+msgstr "已经停止输入"
+
+#: ../src/ui/conversation_summary/message_textview.vala:33
+msgid "Message too long"
+msgstr ""
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:134
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:135
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:138
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%_m 月 %_d 日,%H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:139
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%_m 月 %_d 日,%l∶%M %p"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:142
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%A,%H∶%M"
+
+#: ../src/ui/conversation_summary/conversation_item_skeleton.vala:143
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%A,%l∶%M %p"
+
+#: ../src/ui/occupant_menu/list.vala:105
+msgid "Owner"
+msgstr "所有者"
-#: src/ui/contact_details/dialog.vala:37
-#, fuzzy
+#: ../src/ui/occupant_menu/list.vala:107
+msgid "Admin"
+msgstr "管理员"
+
+#: ../src/ui/occupant_menu/list.vala:109
+msgid "Member"
+msgstr "成员"
+
+#: ../src/ui/occupant_menu/list.vala:111
+msgid "User"
+msgstr "用户"
+
+#: ../src/ui/occupant_menu/view.vala:26 ../src/ui/occupant_menu/view.vala:35
+msgid "Invite"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:34
+msgid "Invite to Conference"
+msgstr ""
+
+#: ../src/ui/occupant_menu/view.vala:84
+msgid "Start private conversation"
+msgstr "启动私密会话"
+
+#: ../src/ui/occupant_menu/view.vala:92
+msgid "Kick"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37
msgid "Conference Details"
+msgstr ""
+
+#: ../src/ui/contact_details/dialog.vala:37 ../data/menu_conversation.ui:6
+msgid "Contact Details"
msgstr "联系人详情"
-#: src/ui/contact_details/muc_config_form_provider.vala:42
+#: ../src/ui/contact_details/muc_config_form_provider.vala:39
msgid "Name of the room"
msgstr "房间名称"
-#: src/ui/contact_details/muc_config_form_provider.vala:45
+#: ../src/ui/contact_details/muc_config_form_provider.vala:42
msgid "Description of the room"
msgstr "房间的描述"
-#: src/ui/contact_details/muc_config_form_provider.vala:48
+#: ../src/ui/contact_details/muc_config_form_provider.vala:45
msgid "Persistent"
msgstr "一直在线"
-#: src/ui/contact_details/muc_config_form_provider.vala:49
+#: ../src/ui/contact_details/muc_config_form_provider.vala:46
msgid "The room will persist after the last occupant exits"
msgstr "此房间将一直保持存在直到最后一个人离开"
-#: src/ui/contact_details/muc_config_form_provider.vala:52
+#: ../src/ui/contact_details/muc_config_form_provider.vala:49
msgid "Publicly searchable"
msgstr "公开可搜索"
-#: src/ui/contact_details/muc_config_form_provider.vala:55
+#: ../src/ui/contact_details/muc_config_form_provider.vala:52
msgid "Occupants may change subject"
msgstr "参与者可以更改主题"
-#: src/ui/contact_details/muc_config_form_provider.vala:58
+#: ../src/ui/contact_details/muc_config_form_provider.vala:55
msgid "Discover real JIDs"
msgstr "发现真实 JID"
-#: src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../src/ui/contact_details/muc_config_form_provider.vala:56
msgid "Who may discover real JIDs?"
msgstr "谁可能发现真实 JID?"
-#: src/ui/contact_details/muc_config_form_provider.vala:63
-#, fuzzy
+#: ../src/ui/contact_details/muc_config_form_provider.vala:59
+#: ../data/manage_accounts/dialog.ui:166
+#: ../data/manage_accounts/add_account_dialog.ui:73
+#: ../data/add_conversation/conference_details_fragment.ui:175
+#: ../data/add_conversation/add_groupchat_dialog.ui:147
+msgid "Password"
+msgstr "密码"
+
+#: ../src/ui/contact_details/muc_config_form_provider.vala:60
msgid "Password required to enter the room. Leave empty for none"
-msgstr "进入房间要求使用密码。留空表示不需要密码"
+msgstr ""
-#: src/ui/contact_details/muc_config_form_provider.vala:66
+#: ../src/ui/contact_details/muc_config_form_provider.vala:63
msgid "Moderated"
msgstr "主持"
-#: src/ui/contact_details/muc_config_form_provider.vala:67
+#: ../src/ui/contact_details/muc_config_form_provider.vala:64
msgid "Only occupants with voice may send messages"
msgstr "只有有声音的参与者可以发送消息"
-#: src/ui/contact_details/muc_config_form_provider.vala:70
+#: ../src/ui/contact_details/muc_config_form_provider.vala:67
msgid "Members only"
msgstr "仅限成员"
-#: src/ui/contact_details/muc_config_form_provider.vala:71
+#: ../src/ui/contact_details/muc_config_form_provider.vala:68
msgid "Only members may enter the room"
msgstr "只有成员才可以进入房间"
-#: src/ui/contact_details/muc_config_form_provider.vala:74
+#: ../src/ui/contact_details/muc_config_form_provider.vala:71
msgid "Message history"
msgstr "消息历史记录"
-#: src/ui/contact_details/muc_config_form_provider.vala:75
+#: ../src/ui/contact_details/muc_config_form_provider.vala:72
msgid "Maximum number of history messages returned by the room"
msgstr "返回的房间的历史消息的最大数目"
-#: src/ui/contact_details/muc_config_form_provider.vala:81
+#: ../src/ui/contact_details/muc_config_form_provider.vala:78
msgid "Room Configuration"
msgstr "房间配置"
-#: src/ui/conversation_selector/chat_row.vala:30
-#: src/ui/conversation_selector/groupchat_pm_row.vala:25
-msgid "Me"
-msgstr ""
-
-#: src/ui/conversation_selector/conversation_row.vala:172
-#, no-c-format
-msgid "%b %d"
-msgstr "%_m 月 %_d 日"
-
-#: src/ui/conversation_selector/conversation_row.vala:176
-msgid "Yesterday"
-msgstr "昨天"
-
-#: src/ui/conversation_selector/conversation_row.vala:179
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:146
-#, no-c-format
-msgid "%H∶%M"
-msgstr "%H∶%M"
-
-#: src/ui/conversation_selector/conversation_row.vala:180
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:147
-#, no-c-format
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#: src/ui/conversation_selector/conversation_row.vala:183
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:151
-#, c-format
-msgid "%i min ago"
-msgid_plural "%i mins ago"
-msgstr[0] "%i 分钟以前"
-
-#: src/ui/conversation_selector/conversation_row.vala:185
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:153
-msgid "Just now"
-msgstr "刚刚"
-
-#: src/ui/conversation_summary/chat_state_populator.vala:58
-msgid "is typing..."
-msgstr "正在输入..."
-
-#: src/ui/conversation_summary/chat_state_populator.vala:60
-msgid "has stopped typing"
-msgstr "已经停止输入"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:134
-#, no-c-format
-msgid "%x, %H∶%M"
-msgstr "%x, %H∶%M"
-
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:135
-#, no-c-format
-msgid "%x, %l∶%M %p"
-msgstr "%x, %l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../src/ui/contact_details/settings_provider.vala:30 ../data/menu_app.ui:10
+msgid "Settings"
+msgstr "设置"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:138
-#, no-c-format
-msgid "%b %d, %H∶%M"
-msgstr "%_m 月 %_d 日,%H∶%M"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Block"
+msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:139
-#, no-c-format
-msgid "%b %d, %l∶%M %p"
-msgstr "%_m 月 %_d 日,%l∶%M %p"
+#: ../src/ui/contact_details/blocking_provider.vala:31
+msgid "Communication and status updates in either direction are blocked"
+msgstr ""
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:142
-#, no-c-format
-msgid "%a, %H∶%M"
-msgstr "%A,%H∶%M"
+#: ../src/ui/contact_details/settings_provider.vala:22
+#: ../data/settings_dialog.ui:22
+msgid "Send typing notifications"
+msgstr "发送打字通知"
-#: src/ui/conversation_summary/conversation_item_skeleton.vala:143
-#, no-c-format
-msgid "%a, %l∶%M %p"
-msgstr "%A,%l∶%M %p"
+#: ../src/ui/contact_details/settings_provider.vala:25
+#: ../data/settings_dialog.ui:34
+msgid "Send message marker"
+msgstr "发送消息标记"
-#: src/ui/conversation_summary/message_textview.vala:33
-#, fuzzy
-msgid "Message too long"
-msgstr "消息历史记录"
+#: ../src/ui/contact_details/settings_provider.vala:30
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Notifications"
+msgstr "通知"
-#: src/ui/manage_accounts/add_account_dialog.vala:21
-msgid "Add Account"
-msgstr "添加帐号"
+#: ../src/ui/contact_details/settings_provider.vala:39
+msgid "Local Settings"
+msgstr "本地设置"
-#: src/ui/manage_accounts/dialog.vala:150
-msgid "Select avatar"
-msgstr "选择头像"
+#: ../src/ui/contact_details/settings_provider.vala:74
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:116
+msgid "On"
+msgstr "开启"
-#: src/ui/manage_accounts/dialog.vala:151
-msgid "Select"
-msgstr "选择"
+#: ../src/ui/contact_details/settings_provider.vala:76
+#: ../src/ui/contact_details/settings_provider.vala:114
+#: ../src/ui/contact_details/settings_provider.vala:117
+msgid "Off"
+msgstr "关闭"
-#: src/ui/manage_accounts/dialog.vala:159
-msgid "Images"
-msgstr ""
+#: ../src/ui/contact_details/settings_provider.vala:78
+msgid "Only when mentioned"
+msgstr "只有被提到时"
-#: src/ui/manage_accounts/dialog.vala:162
-msgid "All files"
+#: ../src/ui/contact_details/settings_provider.vala:80
+#: ../src/ui/contact_details/settings_provider.vala:115
+#, c-format
+msgid "Default: %s"
msgstr ""
-#: src/ui/manage_accounts/dialog.vala:224
-#, fuzzy
-msgid "Connecting…"
-msgstr "连接中..."
-
-#: src/ui/manage_accounts/dialog.vala:226
-msgid "Connected"
-msgstr "已连接"
-
-#: src/ui/manage_accounts/dialog.vala:228
-msgid "Disconnected"
-msgstr "已断开连接"
-
-#: src/ui/manage_accounts/dialog.vala:237
-msgid "Wrong password"
-msgstr "密码错误"
+#: ../data/settings_dialog.ui:7
+msgid "Preferences"
+msgstr "选项"
-#: src/ui/manage_accounts/dialog.vala:240
-#: src/ui/manage_accounts/dialog.vala:242
-msgid "Error"
-msgstr "错误"
+#: ../data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "新消息到达时通知"
-#: src/ui/notifications.vala:103
-msgid "Subscription request"
-msgstr "订阅请求"
+#: ../data/settings_dialog.ui:58
+msgid "Convert smileys to emojis"
+msgstr "将笑脸转换成 Emoji"
-#: src/ui/notifications.vala:107
-msgid "Accept"
-msgstr "接受"
+#: ../data/manage_accounts/dialog.ui:9 ../data/menu_app.ui:6
+msgid "Accounts"
+msgstr "帐号"
-#: src/ui/notifications.vala:108
-msgid "Deny"
-msgstr "拒绝"
+#: ../data/manage_accounts/dialog.ui:196
+#: ../data/manage_accounts/add_account_dialog.ui:102
+msgid "Local alias"
+msgstr "本地别名"
-#: src/ui/occupant_menu/list.vala:107
-msgid "Owner"
-msgstr "所有者"
+#: ../data/manage_accounts/dialog.ui:251
+msgid "No accounts configured"
+msgstr ""
-#: src/ui/occupant_menu/list.vala:109
-msgid "Admin"
-msgstr "管理员"
+#: ../data/manage_accounts/dialog.ui:262
+msgid "Add an account"
+msgstr "添加新账号"
-#: src/ui/occupant_menu/list.vala:111
-msgid "Member"
-msgstr "成员"
+#: ../data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "未加密"
-#: src/ui/occupant_menu/list.vala:113
-msgid "User"
-msgstr "用户"
+#: ../data/menu_app.ui:16
+msgid "Quit"
+msgstr "退出"
-#: src/ui/occupant_menu/view.vala:26 src/ui/occupant_menu/view.vala:35
-msgid "Invite"
-msgstr ""
+#: ../data/conversation_selector/view.ui:14
+msgid "Search"
+msgstr "搜索"
-#: src/ui/occupant_menu/view.vala:34
-#, fuzzy
-msgid "Invite to Conference"
-msgstr "加入群聊"
+#: ../data/add_conversation/conference_details_fragment.ui:19
+#: ../data/add_conversation/add_groupchat_dialog.ui:49
+#: ../data/add_conversation/add_contact_dialog.ui:48
+msgid "Account"
+msgstr "账号"
-#: src/ui/occupant_menu/view.vala:84
-msgid "Start private conversation"
-msgstr "启动私密会话"
+#: ../data/add_conversation/conference_details_fragment.ui:123
+#: ../data/add_conversation/add_groupchat_dialog.ui:120
+msgid "Nick"
+msgstr "昵称"
-#: src/ui/occupant_menu/view.vala:92
-msgid "Kick"
+#: ../data/add_conversation/conference_details_fragment.ui:253
+msgid "This is an app-notification. Click the button to dismiss"
msgstr ""
-#: src/ui/unified_window.vala:141
-msgid "No accounts active"
-msgstr "没有激活的帐号"
+#: ../data/add_conversation/add_groupchat_dialog.ui:175
+#: ../data/add_conversation/add_contact_dialog.ui:101
+msgid "Alias"
+msgstr "别名"
-#: src/ui/unified_window.vala:142
-msgid "Manage accounts"
-msgstr "管理帐号"
+#: ../data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "请求在线更新"
-#: src/ui/unified_window.vala:149
-msgid "No conversation active"
-msgstr "没有激活的会话"
+#~ msgid "Join on startup"
+#~ msgstr "启动时加入"
#~ msgid "Add Chat"
#~ msgstr "添加聊天"
diff --git a/plugins/omemo/po/LINGUAS b/plugins/omemo/po/LINGUAS
index 91eb6061..5d4f2a70 100644
--- a/plugins/omemo/po/LINGUAS
+++ b/plugins/omemo/po/LINGUAS
@@ -1,6 +1,8 @@
de
en
+es
it
lb
+nb
nl
zh_Hans
diff --git a/plugins/omemo/po/POTFILES.in b/plugins/omemo/po/POTFILES.in
deleted file mode 100644
index d5454a22..00000000
--- a/plugins/omemo/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-src/account_settings_widget.vala \ No newline at end of file
diff --git a/plugins/omemo/po/de.po b/plugins/omemo/po/de.po
index 89aebf80..6dd92a9e 100644
--- a/plugins/omemo/po/de.po
+++ b/plugins/omemo/po/de.po
@@ -2,21 +2,58 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-omemo-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
-"Language: en\n"
+"POT-Creation-Date: 2017-11-17 01:27+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/de/>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
-#: src/account_settings_widget.vala:55
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
msgid "Own fingerprint"
msgstr "Eigener Fingerabdruck"
-#: src/account_settings_widget.vala:35
+#: ../src/account_settings_widget.vala:42
msgid "Will be generated on first connect"
msgstr "Wird beim ersten Verbinden erzeugt"
-#: src/account_settings_widget.vala:55
-msgid "Database error"
-msgstr "Datenbank Fehler"
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr "OMEMO"
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] "%d OMEMO Gerät"
+msgstr[1] "%d OMEMO Geräte"
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr "Unbekanntes Gerät (0x%xd)"
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr "OMEMO Schlüssel"
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr "Andere Geräte"
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr "- Keine -"
+
+#~ msgid "Database error"
+#~ msgstr "Datenbank Fehler"
diff --git a/plugins/omemo/po/dino-omemo.pot b/plugins/omemo/po/dino-omemo.pot
index 4d3c583a..e66bc76d 100644
--- a/plugins/omemo/po/dino-omemo.pot
+++ b/plugins/omemo/po/dino-omemo.pot
@@ -1,22 +1,56 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: dino-omemo-0.0\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-18 19:28+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"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
-#: src/account_settings_widget.vala:55
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:19 ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45
msgid "Own fingerprint"
msgstr ""
-#: src/account_settings_widget.vala:35
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr ""
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:42
msgid "Will be generated on first connect"
msgstr ""
-#: src/account_settings_widget.vala:55
-msgid "Database error"
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
msgstr ""
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/plugins/omemo/po/en.po b/plugins/omemo/po/en.po
index c98175e3..26d2428a 100644
--- a/plugins/omemo/po/en.po
+++ b/plugins/omemo/po/en.po
@@ -2,8 +2,49 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-omemo-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n" \ No newline at end of file
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
+msgid "Own fingerprint"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:42
+msgid "Will be generated on first connect"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr ""
diff --git a/plugins/omemo/po/es.po b/plugins/omemo/po/es.po
new file mode 100644
index 00000000..9d02de2a
--- /dev/null
+++ b/plugins/omemo/po/es.po
@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-17 02:03+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-"
+"omemo/es/>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
+
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
+msgid "Own fingerprint"
+msgstr "Tu huella digital"
+
+#: ../src/account_settings_widget.vala:42
+msgid "Will be generated on first connect"
+msgstr "Será generada en la primera conexión"
+
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr "OMEMO"
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] "%d dispositivo OMEMO"
+msgstr[1] "%d dispositivos OMEMO"
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr "Dispositivo (0x%xd) desconocido"
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr "Huellas digitales OMEMO"
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr "Otros dispositivos"
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr "- Ninguno -"
diff --git a/plugins/omemo/po/it.po b/plugins/omemo/po/it.po
index 1c5a0f04..14f6f0fa 100644
--- a/plugins/omemo/po/it.po
+++ b/plugins/omemo/po/it.po
@@ -2,26 +2,58 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-omemo-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-10 17:55+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-17 12:02+0000\n"
+"Last-Translator: Valerio Baldisserotto <svalo@libersoft.it>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/dino/plugin-"
+"omemo/it/>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.8.11\n"
-"Last-Translator: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: it_IT\n"
-
-#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
-#: src/account_settings_widget.vala:55
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
+
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
msgid "Own fingerprint"
msgstr "Propria fingerprint"
-#: src/account_settings_widget.vala:35
+#: ../src/account_settings_widget.vala:42
msgid "Will be generated on first connect"
msgstr "Verrà generata alla prima connessione"
-#: src/account_settings_widget.vala:55
-msgid "Database error"
-msgstr "Errore del database"
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr "Crittografia"
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr "OMEMO"
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] "%d dispositivo OMEMO"
+msgstr[1] "%d dispositivi OMEMO"
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr "Dispositivo sconosciuto (0x%xd)"
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr "Chiavi OMEMO"
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr "Altri dispositivi"
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr "- Nessuno -"
+
+#~ msgid "Database error"
+#~ msgstr "Errore del database"
diff --git a/plugins/omemo/po/lb.po b/plugins/omemo/po/lb.po
index e432f826..191a20b6 100644
--- a/plugins/omemo/po/lb.po
+++ b/plugins/omemo/po/lb.po
@@ -2,26 +2,58 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-omemo-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+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"
+"/plugin-omemo/lb/>\n"
+"Language: lb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 2.0.4\n"
-"Last-Translator: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
-#: src/account_settings_widget.vala:55
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
msgid "Own fingerprint"
msgstr "Eegene Fangerofdrock"
-#: src/account_settings_widget.vala:35
+#: ../src/account_settings_widget.vala:42
msgid "Will be generated on first connect"
msgstr "Gett bei der éischter Connectioun generéiert"
-#: src/account_settings_widget.vala:55
-msgid "Database error"
-msgstr "Datebank Feeler"
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr "Verschlësselung"
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr "OMEMO"
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] "%d OMEMO Gerät"
+msgstr[1] "%d OMEMO Geräter"
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr "Onbekannt Gerät (0x%xd)"
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr "OMEMO Schlësselen"
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr "Aner Geräter"
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr "- Keng -"
+
+#~ msgid "Database error"
+#~ msgstr "Datebank Feeler"
diff --git a/plugins/omemo/po/nb.po b/plugins/omemo/po/nb.po
new file mode 100644
index 00000000..582001bf
--- /dev/null
+++ b/plugins/omemo/po/nb.po
@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-17 02:03+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"
+"/plugin-omemo/nb/>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
+
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
+msgid "Own fingerprint"
+msgstr "Eget fingeravtrykk"
+
+#: ../src/account_settings_widget.vala:42
+msgid "Will be generated on first connect"
+msgstr "Vil bli generert ved første tilkobling"
+
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr "OMEMO"
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] "%d OMEMO-enhet"
+msgstr[1] "%d OMEMO-enheter"
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr "Ukjent enhet (0x%xd)"
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr "OMEMO-nøkler"
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr "Andre enheter"
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr "- Ingen -"
diff --git a/plugins/omemo/po/nl.po b/plugins/omemo/po/nl.po
index 3c8f28ea..62a84eb1 100644
--- a/plugins/omemo/po/nl.po
+++ b/plugins/omemo/po/nl.po
@@ -2,23 +2,58 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-omemo-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-10 17:55+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+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/nl/>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: nl_NL\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
-#: src/account_settings_widget.vala:55
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
msgid "Own fingerprint"
msgstr "Eigen vingerafdruk"
-#: src/account_settings_widget.vala:35
+#: ../src/account_settings_widget.vala:42
msgid "Will be generated on first connect"
-msgstr "Wordt bij eerste contact gegenereerd"
+msgstr "Wordt bij eerste verbinding gegenereerd"
-#: src/account_settings_widget.vala:55
-msgid "Database error"
-msgstr "Database fout"
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr "Versleuteling"
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr "OMEMO"
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] "%d OMEMO-apparaat"
+msgstr[1] "%d OMEMO-apparaten"
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr "Onbekend apparaat (0x%xd)"
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr "OMEMO-sleutels"
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr "Andere apparaten"
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr "- Geen -"
+
+#~ msgid "Database error"
+#~ msgstr "Databasefout"
diff --git a/plugins/omemo/po/zh_Hans.po b/plugins/omemo/po/zh_Hans.po
index 35d6eaa2..2fda0c42 100644
--- a/plugins/omemo/po/zh_Hans.po
+++ b/plugins/omemo/po/zh_Hans.po
@@ -2,22 +2,54 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-omemo-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-05-08 01:21+0800\n"
+"Language-Team: Chinese (simplified)\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-08 01:21+0800\n"
-"Language-Team: Chinese (simplified)\n"
-#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
-#: src/account_settings_widget.vala:55
+#: ../src/account_settings_widget.vala:42
+#: ../src/account_settings_widget.vala:45 ../data/account_settings_dialog.ui:19
msgid "Own fingerprint"
msgstr "自己的指纹"
-#: src/account_settings_widget.vala:35
+#: ../src/account_settings_widget.vala:42
msgid "Will be generated on first connect"
msgstr "会在第一次连接时生成"
-#: src/account_settings_widget.vala:55
-msgid "Database error"
-msgstr "数据库错误"
+#: ../src/contact_details_provider.vala:31
+msgid "Encryption"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:31
+msgid "OMEMO"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:31
+#, c-format
+msgid "%d OMEMO device"
+msgid_plural "%d OMEMO devices"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/account_settings_dialog.vala:35
+#, c-format
+msgid "Unknown device (0x%xd)"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:5
+msgid "OMEMO Keys"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:88
+msgid "Other devices"
+msgstr ""
+
+#: ../data/account_settings_dialog.ui:112
+msgid "- None -"
+msgstr ""
+
+#~ msgid "Database error"
+#~ msgstr "数据库错误"
diff --git a/plugins/omemo/src/contact_details_provider.vala b/plugins/omemo/src/contact_details_provider.vala
index 8155424d..05b85d9f 100644
--- a/plugins/omemo/src/contact_details_provider.vala
+++ b/plugins/omemo/src/contact_details_provider.vala
@@ -28,7 +28,7 @@ public class ContactDetailsProvider : Plugins.ContactDetailsProvider, Object {
}
if (i > 0) {
Label label = new Label(res) { use_markup=true, justify=Justification.RIGHT, selectable=true, visible=true };
- contact_details.add(_("Encryption"), _("OMEMO"), n("%d OMEMO device", "%d OMEMO devices", i).printf(i), label);
+ contact_details.add(_("Encryption"), "OMEMO", n("%d OMEMO device", "%d OMEMO devices", i).printf(i), label);
}
}
}
diff --git a/plugins/openpgp/po/LINGUAS b/plugins/openpgp/po/LINGUAS
index 91eb6061..5d4f2a70 100644
--- a/plugins/openpgp/po/LINGUAS
+++ b/plugins/openpgp/po/LINGUAS
@@ -1,6 +1,8 @@
de
en
+es
it
lb
+nb
nl
zh_Hans
diff --git a/plugins/openpgp/po/POTFILES.in b/plugins/openpgp/po/POTFILES.in
deleted file mode 100644
index d5454a22..00000000
--- a/plugins/openpgp/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-src/account_settings_widget.vala \ No newline at end of file
diff --git a/plugins/openpgp/po/de.po b/plugins/openpgp/po/de.po
index 72b80946..fd073e6f 100644
--- a/plugins/openpgp/po/de.po
+++ b/plugins/openpgp/po/de.po
@@ -2,33 +2,52 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-openpgp-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-17 20:59+0000\n"
+"Last-Translator: fiaxh <weblate@mx.ax.lt>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/dino/plugin-"
+"openpgp/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: src/account_settings_widget.vala:74 src/account_settings_widget.vala:80
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
msgid "Key publishing disabled"
msgstr "Schlüsselveröffentlichung deaktiviert"
-#: src/account_settings_widget.vala:74
+#: ../src/account_settings_widget.vala:75
msgid "No keys available. Generate one!"
msgstr "Keine Schlüssel vorhanden. Erzeuge einen!"
-#: src/account_settings_widget.vala:80
+#: ../src/account_settings_widget.vala:81
msgid "Select key"
msgstr "Wähle Schlüssel"
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Loading..."
msgstr "Lade..."
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Querying GnuPG"
msgstr "Frage GnuPG ab"
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:109
msgid "Error in GnuPG"
msgstr "Fehler in GnuPG"
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr "Schlüssel nicht im Schlüsselbund"
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr "OpenPGP"
diff --git a/plugins/openpgp/po/dino-openpgp.pot b/plugins/openpgp/po/dino-openpgp.pot
index 6723816c..ac098ec9 100644
--- a/plugins/openpgp/po/dino-openpgp.pot
+++ b/plugins/openpgp/po/dino-openpgp.pot
@@ -1,34 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: dino-openpgp-0.0\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-18 19:28+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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/account_settings_widget.vala:74 src/account_settings_widget.vala:80
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
msgid "Key publishing disabled"
msgstr ""
-#: src/account_settings_widget.vala:74
+#: ../src/account_settings_widget.vala:75
msgid "No keys available. Generate one!"
msgstr ""
-#: src/account_settings_widget.vala:80
+#: ../src/account_settings_widget.vala:81
msgid "Select key"
msgstr ""
-#: src/account_settings_widget.vala:97
-msgid "Loading..."
+#: ../src/account_settings_widget.vala:98
+msgid "Loading…"
msgstr ""
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Querying GnuPG"
msgstr ""
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:109
msgid "Error in GnuPG"
msgstr ""
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr ""
diff --git a/plugins/openpgp/po/en.po b/plugins/openpgp/po/en.po
index 55ee0060..9aee2b50 100644
--- a/plugins/openpgp/po/en.po
+++ b/plugins/openpgp/po/en.po
@@ -2,8 +2,46 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-openpgp-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n" \ No newline at end of file
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
+msgid "Key publishing disabled"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:75
+msgid "No keys available. Generate one!"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:81
+msgid "Select key"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:98
+msgid "Loading..."
+msgstr ""
+
+#: ../src/account_settings_widget.vala:98
+msgid "Querying GnuPG"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:109
+msgid "Error in GnuPG"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr ""
diff --git a/plugins/openpgp/po/es.po b/plugins/openpgp/po/es.po
new file mode 100644
index 00000000..78ccbcd8
--- /dev/null
+++ b/plugins/openpgp/po/es.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-17 02:03+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
+msgid "Key publishing disabled"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:75
+msgid "No keys available. Generate one!"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:81
+msgid "Select key"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:98
+msgid "Loading…"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:98
+msgid "Querying GnuPG"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:109
+msgid "Error in GnuPG"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr ""
diff --git a/plugins/openpgp/po/it.po b/plugins/openpgp/po/it.po
index 7c98074f..5c339ac0 100644
--- a/plugins/openpgp/po/it.po
+++ b/plugins/openpgp/po/it.po
@@ -2,38 +2,52 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-openpgp-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-10 17:51+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-17 11:57+0000\n"
+"Last-Translator: Valerio Baldisserotto <svalo@libersoft.it>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/dino/plugin-"
+"openpgp/it/>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.8.11\n"
-"Last-Translator: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: it_IT\n"
-
-#: src/account_settings_widget.vala:74 src/account_settings_widget.vala:80
-#: src/account_settings_widget.vala:108
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
+
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
msgid "Key publishing disabled"
msgstr "Pubblicazione della chiave disabilitata"
-#: src/account_settings_widget.vala:74
+#: ../src/account_settings_widget.vala:75
msgid "No keys available. Generate one!"
msgstr "Nessuna chiave disponibile. Generane una!"
-#: src/account_settings_widget.vala:80
+#: ../src/account_settings_widget.vala:81
msgid "Select key"
msgstr "Seleziona una chiave"
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Loading..."
msgstr "Caricamento..."
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Querying GnuPG"
msgstr "Interrogando GnuPG"
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:109
msgid "Error in GnuPG"
msgstr "Errore in GnuPG"
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr "La chiave non è nel portachiavi"
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr "Crittografia"
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr "OpenPGP"
diff --git a/plugins/openpgp/po/lb.po b/plugins/openpgp/po/lb.po
index 1e6f9bab..f5245ecd 100644
--- a/plugins/openpgp/po/lb.po
+++ b/plugins/openpgp/po/lb.po
@@ -2,38 +2,52 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-openpgp-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-11-18 02:16+0000\n"
+"Last-Translator: Dennis Fink <dennis.fink@c3l.lu>\n"
+"Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino"
+"/plugin-openpgp/lb/>\n"
+"Language: lb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 2.0.4\n"
-"Last-Translator: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: lb\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
-#: src/account_settings_widget.vala:74 src/account_settings_widget.vala:80
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
msgid "Key publishing disabled"
msgstr "Schlëssel Verëffentlechung ausgeschalt"
-#: src/account_settings_widget.vala:74
+#: ../src/account_settings_widget.vala:75
msgid "No keys available. Generate one!"
msgstr "Keng Schlëssele verfügbar. Generéier een!"
-#: src/account_settings_widget.vala:80
+#: ../src/account_settings_widget.vala:81
msgid "Select key"
msgstr "Schlëssel auswielen"
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Loading..."
msgstr "Lueden..."
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Querying GnuPG"
msgstr "GnuPG gëtt ofgefrot"
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:109
msgid "Error in GnuPG"
msgstr "Feeler am GnuPG"
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr "Schlësselen net am Schlësselbond"
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr "Verschlësselung"
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr "OpenPGP"
diff --git a/plugins/openpgp/po/nb.po b/plugins/openpgp/po/nb.po
new file mode 100644
index 00000000..64e9cf43
--- /dev/null
+++ b/plugins/openpgp/po/nb.po
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-17 02:03+0100\n"
+"PO-Revision-Date: 2017-11-18 00:23+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino"
+"/plugin-openpgp/nb/>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
+
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
+msgid "Key publishing disabled"
+msgstr "Nøkkelpublisering avskrudd"
+
+#: ../src/account_settings_widget.vala:75
+msgid "No keys available. Generate one!"
+msgstr "Ingen nøkler tilgjengelige. Generer én."
+
+#: ../src/account_settings_widget.vala:81
+msgid "Select key"
+msgstr "Velg nøkkel"
+
+#: ../src/account_settings_widget.vala:98
+msgid "Loading…"
+msgstr "Laster…"
+
+#: ../src/account_settings_widget.vala:98
+msgid "Querying GnuPG"
+msgstr "Sender spørring til GnuPG"
+
+#: ../src/account_settings_widget.vala:109
+msgid "Error in GnuPG"
+msgstr "Feil i GnuPG"
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr "Nøkkelen finnes ikke i nøkkelknippet"
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr "OpenPGP"
diff --git a/plugins/openpgp/po/nl.po b/plugins/openpgp/po/nl.po
index ba41359d..84b420d6 100644
--- a/plugins/openpgp/po/nl.po
+++ b/plugins/openpgp/po/nl.po
@@ -2,38 +2,52 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-openpgp-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-10 17:51+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+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-"
+"openpgp/nl/>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.8.11\n"
-"Last-Translator: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: nl_NL\n"
-
-#: src/account_settings_widget.vala:74 src/account_settings_widget.vala:80
-#: src/account_settings_widget.vala:108
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.18-dev\n"
+
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
msgid "Key publishing disabled"
-msgstr "Publiceren sleutel uitgeschakeld"
+msgstr "Publiceren van sleutels uitgeschakeld"
-#: src/account_settings_widget.vala:74
+#: ../src/account_settings_widget.vala:75
msgid "No keys available. Generate one!"
-msgstr "Geen sleutels voorhanden. Genereer er een!"
+msgstr "Geen sleutels beschikbaar. Genereer er een!"
-#: src/account_settings_widget.vala:80
+#: ../src/account_settings_widget.vala:81
msgid "Select key"
-msgstr "Sleutel selecteren"
+msgstr "Selecteer een sleutel"
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Loading..."
-msgstr "Laden..."
+msgstr "Laden…"
-#: src/account_settings_widget.vala:97
+#: ../src/account_settings_widget.vala:98
msgid "Querying GnuPG"
-msgstr "GnuPG Vragen"
+msgstr "GnuPG inroepen"
-#: src/account_settings_widget.vala:108
+#: ../src/account_settings_widget.vala:109
msgid "Error in GnuPG"
msgstr "Fout in GnuPG"
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr "Sleutel niet in sleutelbos"
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr "Versleuteling"
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr "OpenPGP"
diff --git a/plugins/openpgp/po/zh_Hans.po b/plugins/openpgp/po/zh_Hans.po
index 35d6eaa2..b823dd1f 100644
--- a/plugins/openpgp/po/zh_Hans.po
+++ b/plugins/openpgp/po/zh_Hans.po
@@ -2,22 +2,57 @@ msgid ""
msgstr ""
"Project-Id-Version: dino-omemo-0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-07 15:43+0200\n"
+"POT-Creation-Date: 2017-11-17 01:27+0100\n"
+"PO-Revision-Date: 2017-05-08 01:21+0800\n"
+"Language-Team: Chinese (simplified)\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-05-08 01:21+0800\n"
-"Language-Team: Chinese (simplified)\n"
-#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
-#: src/account_settings_widget.vala:55
-msgid "Own fingerprint"
-msgstr "自己的指纹"
+#: ../src/account_settings_widget.vala:75
+#: ../src/account_settings_widget.vala:81
+#: ../src/account_settings_widget.vala:109
+msgid "Key publishing disabled"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:75
+msgid "No keys available. Generate one!"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:81
+msgid "Select key"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:98
+msgid "Loading..."
+msgstr ""
+
+#: ../src/account_settings_widget.vala:98
+msgid "Querying GnuPG"
+msgstr ""
+
+#: ../src/account_settings_widget.vala:109
+msgid "Error in GnuPG"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:28
+msgid "Key not in keychain"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:30
+msgid "Encryption"
+msgstr ""
+
+#: ../src/contact_details_provider.vala:30
+msgid "OpenPGP"
+msgstr ""
+
+#~ msgid "Own fingerprint"
+#~ msgstr "自己的指纹"
-#: src/account_settings_widget.vala:35
-msgid "Will be generated on first connect"
-msgstr "会在第一次连接时生成"
+#~ msgid "Will be generated on first connect"
+#~ msgstr "会在第一次连接时生成"
-#: src/account_settings_widget.vala:55
-msgid "Database error"
-msgstr "数据库错误"
+#~ msgid "Database error"
+#~ msgstr "数据库错误"
diff --git a/plugins/openpgp/src/contact_details_provider.vala b/plugins/openpgp/src/contact_details_provider.vala
index b691cc19..aa2b1c47 100644
--- a/plugins/openpgp/src/contact_details_provider.vala
+++ b/plugins/openpgp/src/contact_details_provider.vala
@@ -27,7 +27,7 @@ public class ContactDetailsProvider : Plugins.ContactDetailsProvider, Object {
} else {
label.label = _("Key not in keychain") + "\n" + markup_colorize_id(key_id, false);
}
- contact_details.add(_("Encryption"), _("OpenPGP"), "", label);
+ contact_details.add(_("Encryption"), "OpenPGP", "", label);
}
}
}