diff --git a/main/po/LINGUAS b/main/po/LINGUAS
index 685f65ef..ea8fca5d 100644
--- a/main/po/LINGUAS
+++ b/main/po/LINGUAS
@@ -1,2 +1,9 @@
 de
-en
\ No newline at end of file
+en
+eo
+es
+fr
+it
+nl
+pt_BR
+zh_Hans
diff --git a/main/po/POTFILES.in b/main/po/POTFILES.in
index d3009749..b694da08 100644
--- a/main/po/POTFILES.in
+++ b/main/po/POTFILES.in
@@ -11,11 +11,14 @@ data/menu_encryption.ui
 data/settings_dialog.ui
 src/ui/add_conversation/conference/add_groupchat_dialog.vala
 src/ui/add_conversation/conference/dialog.vala
+src/ui/contact_details/muc_config_form_provider.vala
+src/ui/contact_details/settings_provider.vala
 src/ui/conversation_selector/conversation_row.vala
 src/ui/conversation_summary/message_item.vala
 src/ui/conversation_summary/view.vala
 src/ui/manage_accounts/add_account_dialog.vala
 src/ui/manage_accounts/dialog.vala
+src/ui/occupant_menu/list.vala
 src/ui/occupant_menu/view.vala
 src/ui/notifications.vala
 src/ui/unified_window.vala
\ No newline at end of file
diff --git a/main/po/de.po b/main/po/de.po
index 3b708ef9..cc62cfde 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,17 +2,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-13 13:48+0200\n"
+"POT-Creation-Date: 2017-05-31 20:04+0200\n"
+"PO-Revision-Date: 2017-04-20 23:51+0000\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"
+"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/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:152
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -44,7 +45,8 @@ msgstr "Nick"
 #: 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:163
+#: data/manage_accounts/dialog.ui:166
+#: src/ui/contact_details/muc_config_form_provider.vala:62
 msgid "Password"
 msgstr "Passwort"
 
@@ -52,7 +54,7 @@ msgstr "Passwort"
 msgid "Join on startup"
 msgstr "Beim Start beitreten"
 
-#: data/conversation_selector/view.ui:16
+#: data/conversation_selector/view.ui:15
 msgid "Search"
 msgstr "Suchen"
 
@@ -62,7 +64,7 @@ msgid "Save"
 msgstr "Speichern"
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:217
+#: data/manage_accounts/dialog.ui:220
 msgid "Local alias"
 msgstr "Lokaler Alias"
 
@@ -70,7 +72,7 @@ msgstr "Lokaler Alias"
 msgid "Accounts"
 msgstr "Konten"
 
-#: data/manage_accounts/dialog.ui:306
+#: data/manage_accounts/dialog.ui:309
 msgid "Add an account"
 msgstr "Konto hinzufügen"
 
@@ -79,11 +81,13 @@ msgid "Start Chat"
 msgstr "Chat starten"
 
 #: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:145
+#: src/ui/unified_window.vala:149
 msgid "Join Conference"
 msgstr "Konferenz beitreten"
 
-#: data/menu_app.ui:10
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -91,7 +95,7 @@ msgstr "Einstellungen"
 msgid "Quit"
 msgstr "Beenden"
 
-#: data/menu_conversation.ui:5
+#: data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr "Kontakt Details"
 
@@ -99,15 +103,23 @@ msgstr "Kontakt Details"
 msgid "Unencrypted"
 msgstr "Unverschlüsselt"
 
-#: data/settings_dialog.ui:8
+#: data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: data/settings_dialog.ui:23
-msgid "Send typing notifications and message marker"
-msgstr "Sende Tippbenachrichtigung und Empfangsbestätigung"
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+msgid "Send typing notifications"
+msgstr "Sende Tippbenachrichtigungen"
 
-#: data/settings_dialog.ui:35
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+msgid "Send message marker"
+msgstr "Sende Lesebestätigung"
+
+#: data/settings_dialog.ui:46
+msgid "Notify when a new message arrives"
+msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
+
+#: data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
 msgstr "Smileys zu Emojis umwandeln"
 
@@ -119,31 +131,122 @@ msgstr "Weiter"
 msgid "Join"
 msgstr "Beitreten"
 
-#. Day and month
-#: src/ui/conversation_selector/conversation_row.vala:175
+#: src/ui/contact_details/muc_config_form_provider.vala:42
+msgid "Name of the room"
+msgstr "Name des Raums"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:45
+msgid "Description of the room"
+msgstr "Beschreibung des Raums"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:48
+msgid "Persistent"
+msgstr "Persistent"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:49
+msgid "The room will persist after the last occupant exits"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:52
+msgid "Publicly searchable"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:55
+msgid "Occupants may change subject"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:58
+#, fuzzy
+msgid "Discover real JIDs"
+msgstr "Wer erfährt echte JIDs?"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:59
+#, fuzzy
+msgid "Who may discover real JIDs?"
+msgstr "Wer erfährt echte JIDs?"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:63
+msgid "Passwort required to enter the room. Leave empty for none"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:66
+msgid "Moderated"
+msgstr "Moderiert"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Only occupants with voice may send messages"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:70
+msgid "Members only"
+msgstr "Ausschließlich Mitglieder"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:71
+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
+msgid "Message history"
+msgstr "Chatverlauf"
+
+#: src/ui/contact_details/muc_config_form_provider.vala:75
+msgid "Maximum number of history messages returned by the room"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:80
+msgid "Room Configuration"
+msgstr "Raum Konfiguration"
+
+#: src/ui/contact_details/settings_provider.vala:21
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Default"
+msgstr "Standard"
+
+#: src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:41
+msgid "On"
+msgstr "An"
+
+#: src/ui/contact_details/settings_provider.vala:23
+#: src/ui/contact_details/settings_provider.vala:42
+msgid "Off"
+msgstr "Aus"
+
+#: src/ui/contact_details/settings_provider.vala:34
+#: src/ui/contact_details/settings_provider.vala:43
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: src/ui/contact_details/settings_provider.vala:40
+msgid "Only when mentioned"
+msgstr "Nur bei Erwähnung"
+
+#: src/ui/contact_details/settings_provider.vala:43
+msgid "Local Settings"
+msgstr "Lokale Einstellungen"
+
+#: src/ui/conversation_selector/conversation_row.vala:173
 #, no-c-format
 msgid "%b %d"
 msgstr "%d. %b"
 
-#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_selector/conversation_row.vala:177
 msgid "Yesterday"
 msgstr "Gestern"
 
-#. Time in 24h format (w/o seconds)
-#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_selector/conversation_row.vala:180
 #: src/ui/conversation_summary/message_item.vala:110
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#. Time in 12h format (w/o seconds)
-#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_selector/conversation_row.vala:181
 #: src/ui/conversation_summary/message_item.vala:111
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_selector/conversation_row.vala:184
 #: src/ui/conversation_summary/message_item.vala:114
 #, c-format
 msgid "%i min ago"
@@ -151,36 +254,31 @@ msgid_plural "%i mins ago"
 msgstr[0] "vor %i min"
 msgstr[1] "vor %i mins"
 
-#: src/ui/conversation_selector/conversation_row.vala:188
+#: src/ui/conversation_selector/conversation_row.vala:186
 #: src/ui/conversation_summary/message_item.vala:116
 msgid "Just now"
 msgstr "Gerade eben"
 
-#. Date + time in 24h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:98
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#. Date + time in 12h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:99
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#. Month, day and time in 24h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:102
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d. %b, %H∶%M"
 
-#. Month, day and time in 12h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:103
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d. %b, %l∶%M %p"
 
-#. Day of week and time in 12h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:106
 #, no-c-format
 msgid "%a, %H∶%M"
@@ -203,63 +301,85 @@ msgstr "hat aufgehört zu tippen"
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: src/ui/manage_accounts/dialog.vala:150
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select avatar"
 msgstr "Kontaktbild auswählen"
 
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:153
 msgid "Select"
 msgstr "Auswählen"
 
-#: src/ui/manage_accounts/dialog.vala:251
+#: src/ui/manage_accounts/dialog.vala:252
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/ui/manage_accounts/dialog.vala:253
+#: src/ui/manage_accounts/dialog.vala:254
 msgid "Connected"
 msgstr "Verbunden"
 
-#: src/ui/manage_accounts/dialog.vala:255
+#: src/ui/manage_accounts/dialog.vala:256
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
-#: src/ui/manage_accounts/dialog.vala:278
+#: src/ui/manage_accounts/dialog.vala:279
 msgid "Wrong password"
 msgstr "Passwort falsch"
 
-#: src/ui/manage_accounts/dialog.vala:281
-#: src/ui/manage_accounts/dialog.vala:283
+#: src/ui/manage_accounts/dialog.vala:282
+#: src/ui/manage_accounts/dialog.vala:284
 msgid "Error"
 msgstr "Fehler"
 
+#: 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:48
 msgid "Start private conversation"
-msgstr "Private Konversation beginnen"
+msgstr "Private Unterhaltung beginnen"
 
-#: src/ui/notifications.vala:64
+#: src/ui/notifications.vala:70
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: src/ui/notifications.vala:66
+#: src/ui/notifications.vala:72
 msgid "Accept"
 msgstr "Annehmen"
 
-#: src/ui/notifications.vala:79
+#: src/ui/notifications.vala:85
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: src/ui/unified_window.vala:135
+#: src/ui/unified_window.vala:139
 msgid "No accounts active"
 msgstr "Keine Konten aktiv"
 
-#: src/ui/unified_window.vala:136
+#: src/ui/unified_window.vala:140
 msgid "Manage accounts"
 msgstr "Konten verwalten"
 
-#: src/ui/unified_window.vala:143
+#: src/ui/unified_window.vala:147
 msgid "No conversation active"
-msgstr "Keine Konversation aktiv"
+msgstr "Keine Unterhaltung aktiv"
 
-#: src/ui/unified_window.vala:144
+#: src/ui/unified_window.vala:148
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
diff --git a/main/po/dino.pot b/main/po/dino.pot
index cb9d03b2..14210fe7 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-04-13 13:48+0200\n"
+"POT-Creation-Date: 2017-05-31 20:04+0200\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"
@@ -21,7 +21,7 @@ msgstr ""
 #: data/add_conversation/add_contact_dialog.ui:11
 #: data/add_conversation/add_groupchat_dialog.ui:11
 #: src/ui/add_conversation/conference/dialog.vala:15
-#: src/ui/manage_accounts/dialog.vala:151
+#: src/ui/manage_accounts/dialog.vala:152
 msgid "Cancel"
 msgstr ""
 
@@ -53,7 +53,8 @@ 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:163
+#: data/manage_accounts/dialog.ui:166
+#: src/ui/contact_details/muc_config_form_provider.vala:62
 msgid "Password"
 msgstr ""
 
@@ -61,7 +62,7 @@ msgstr ""
 msgid "Join on startup"
 msgstr ""
 
-#: data/conversation_selector/view.ui:16
+#: data/conversation_selector/view.ui:15
 msgid "Search"
 msgstr ""
 
@@ -71,7 +72,7 @@ msgid "Save"
 msgstr ""
 
 #: data/manage_accounts/add_account_dialog.ui:102
-#: data/manage_accounts/dialog.ui:217
+#: data/manage_accounts/dialog.ui:220
 msgid "Local alias"
 msgstr ""
 
@@ -79,7 +80,7 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#: data/manage_accounts/dialog.ui:306
+#: data/manage_accounts/dialog.ui:309
 msgid "Add an account"
 msgstr ""
 
@@ -88,11 +89,13 @@ msgid "Start Chat"
 msgstr ""
 
 #: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
-#: src/ui/unified_window.vala:145
+#: src/ui/unified_window.vala:149
 msgid "Join Conference"
 msgstr ""
 
-#: data/menu_app.ui:10
+#: data/menu_app.ui:10 src/ui/contact_details/settings_provider.vala:26
+#: src/ui/contact_details/settings_provider.vala:30
+#: src/ui/contact_details/settings_provider.vala:34
 msgid "Settings"
 msgstr ""
 
@@ -100,7 +103,7 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#: data/menu_conversation.ui:5
+#: data/menu_conversation.ui:6
 msgid "Contact Details"
 msgstr ""
 
@@ -108,15 +111,23 @@ msgstr ""
 msgid "Unencrypted"
 msgstr ""
 
-#: data/settings_dialog.ui:8
+#: data/settings_dialog.ui:7
 msgid "Preferences"
 msgstr ""
 
-#: data/settings_dialog.ui:23
-msgid "Send typing notifications and message marker"
+#: data/settings_dialog.ui:22 src/ui/contact_details/settings_provider.vala:26
+msgid "Send typing notifications"
 msgstr ""
 
-#: data/settings_dialog.ui:35
+#: data/settings_dialog.ui:34 src/ui/contact_details/settings_provider.vala:30
+msgid "Send message marker"
+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 ""
 
@@ -128,31 +139,120 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#. Day and month
-#: src/ui/conversation_selector/conversation_row.vala:175
+#: src/ui/contact_details/muc_config_form_provider.vala:42
+msgid "Name of the room"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:45
+msgid "Description of the room"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:48
+msgid "Persistent"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:49
+msgid "The room will persist after the last occupant exits"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:52
+msgid "Publicly searchable"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:55
+msgid "Occupants may change subject"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:58
+msgid "Discover real JIDs"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:59
+msgid "Who may discover real JIDs?"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:63
+msgid "Passwort required to enter the room. Leave empty for none"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:66
+msgid "Moderated"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:67
+msgid "Only occupants with voice may send messages"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:70
+msgid "Members only"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:71
+msgid "Only members may enter the room"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:74
+msgid "Message history"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:75
+msgid "Maximum number of history messages returned by the room"
+msgstr ""
+
+#: src/ui/contact_details/muc_config_form_provider.vala:80
+msgid "Room Configuration"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:21
+#: src/ui/contact_details/settings_provider.vala:39
+msgid "Default"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:22
+#: src/ui/contact_details/settings_provider.vala:41
+msgid "On"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:23
+#: src/ui/contact_details/settings_provider.vala:42
+msgid "Off"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:34
+#: src/ui/contact_details/settings_provider.vala:43
+msgid "Notifications"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:40
+msgid "Only when mentioned"
+msgstr ""
+
+#: src/ui/contact_details/settings_provider.vala:43
+msgid "Local Settings"
+msgstr ""
+
+#: src/ui/conversation_selector/conversation_row.vala:173
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: src/ui/conversation_selector/conversation_row.vala:179
+#: src/ui/conversation_selector/conversation_row.vala:177
 msgid "Yesterday"
 msgstr ""
 
-#. Time in 24h format (w/o seconds)
-#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_selector/conversation_row.vala:180
 #: src/ui/conversation_summary/message_item.vala:110
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#. Time in 12h format (w/o seconds)
-#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_selector/conversation_row.vala:181
 #: src/ui/conversation_summary/message_item.vala:111
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_selector/conversation_row.vala:184
 #: src/ui/conversation_summary/message_item.vala:114
 #, c-format
 msgid "%i min ago"
@@ -160,36 +260,31 @@ msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/ui/conversation_selector/conversation_row.vala:188
+#: src/ui/conversation_selector/conversation_row.vala:186
 #: src/ui/conversation_summary/message_item.vala:116
 msgid "Just now"
 msgstr ""
 
-#. Date + time in 24h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:98
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#. Date + time in 12h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:99
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#. Month, day and time in 24h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:102
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#. Month, day and time in 12h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:103
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#. Day of week and time in 12h format (w/o seconds)
 #: src/ui/conversation_summary/message_item.vala:106
 #, no-c-format
 msgid "%a, %H∶%M"
@@ -212,63 +307,79 @@ msgstr ""
 msgid "Add Account"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:150
+#: src/ui/manage_accounts/dialog.vala:151
 msgid "Select avatar"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:152
+#: src/ui/manage_accounts/dialog.vala:153
 msgid "Select"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:251
+#: src/ui/manage_accounts/dialog.vala:252
 msgid "Connecting..."
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:253
+#: src/ui/manage_accounts/dialog.vala:254
 msgid "Connected"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:255
+#: src/ui/manage_accounts/dialog.vala:256
 msgid "Disconnected"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:278
+#: src/ui/manage_accounts/dialog.vala:279
 msgid "Wrong password"
 msgstr ""
 
-#: src/ui/manage_accounts/dialog.vala:281
-#: src/ui/manage_accounts/dialog.vala:283
+#: src/ui/manage_accounts/dialog.vala:282
+#: src/ui/manage_accounts/dialog.vala:284
 msgid "Error"
 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:48
 msgid "Start private conversation"
 msgstr ""
 
-#: src/ui/notifications.vala:64
+#: src/ui/notifications.vala:70
 msgid "Subscription request"
 msgstr ""
 
-#: src/ui/notifications.vala:66
+#: src/ui/notifications.vala:72
 msgid "Accept"
 msgstr ""
 
-#: src/ui/notifications.vala:79
+#: src/ui/notifications.vala:85
 msgid "Deny"
 msgstr ""
 
-#: src/ui/unified_window.vala:135
+#: src/ui/unified_window.vala:139
 msgid "No accounts active"
 msgstr ""
 
-#: src/ui/unified_window.vala:136
+#: src/ui/unified_window.vala:140
 msgid "Manage accounts"
 msgstr ""
 
-#: src/ui/unified_window.vala:143
+#: src/ui/unified_window.vala:147
 msgid "No conversation active"
 msgstr ""
 
-#: src/ui/unified_window.vala:144
+#: src/ui/unified_window.vala:148
 msgid "Add Chat"
 msgstr ""
diff --git a/main/po/eo.po b/main/po/eo.po
new file mode 100644
index 00000000..40f4febf
--- /dev/null
+++ b/main/po/eo.po
@@ -0,0 +1,272 @@
+# 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-04-13 13:48+0200\n"
+"PO-Revision-Date: 2017-04-29 22:26+0000\n"
+"Language-Team: Esperanto "
+"Language: eo\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"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+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"
+
+#: 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"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Kaŝnomo"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Peti sciigojn pri ĉeesto"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Kaŝnomo"
+
+#: 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:163
+msgid "Password"
+msgstr "Pasvorto"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "Aliĝi je lanĉo"
+
+#: data/conversation_selector/view.ui:16
+msgid "Search"
+msgstr "Serĉi"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Konservi"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:217
+msgid "Local alias"
+msgstr "Loka kaŝnomo"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Kontoj"
+
+#: data/manage_accounts/dialog.ui:306
+msgid "Add an account"
+msgstr "Aldoni konton"
+
+#: data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Ekbabili"
+
+#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:145
+msgid "Join Conference"
+msgstr "Aliĝi al Kunveno"
+
+#: data/menu_app.ui:10
+msgid "Settings"
+msgstr "Agordoj"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Ĉesi"
+
+#: data/menu_conversation.ui:5
+msgid "Contact Details"
+msgstr "Kontaktaj Detaloj"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Neĉifrita"
+
+#: data/settings_dialog.ui:8
+msgid "Preferences"
+msgstr "Preferoj"
+
+#: data/settings_dialog.ui:23
+msgid "Send typing notifications and message marker"
+msgstr "Sendi sciigojn pri tajpado kaj mesaĝmarkilo"
+
+#: data/settings_dialog.ui:35
+msgid "Convert smileys to emojis"
+msgstr "Grafikigi tekstajn mienetojn"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Sekva"
+
+#: src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Aliĝi"
+
+#. Day and month
+#: src/ui/conversation_selector/conversation_row.vala:175
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+msgid "Yesterday"
+msgstr "Hieraŭ"
+
+#. Time in 24h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_summary/message_item.vala:110
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#. Time in 12h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/message_item.vala:111
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_summary/message_item.vala:114
+#, 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:188
+#: src/ui/conversation_summary/message_item.vala:116
+msgid "Just now"
+msgstr "Ĵus"
+
+#. Date + time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:98
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#. Date + time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:99
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#. Month, day and time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:102
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#. Month, day and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:103
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#. Day of week and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:106
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: src/ui/conversation_summary/message_item.vala:107
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: src/ui/conversation_summary/view.vala:120
+msgid "is typing..."
+msgstr "tajpas…"
+
+#: src/ui/conversation_summary/view.vala:122
+msgid "has stopped typing"
+msgstr "ĉesis tajpi"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Aldoni Konton"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "Elekti profilbildon"
+
+#: src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Elekti"
+
+#: src/ui/manage_accounts/dialog.vala:251
+msgid "Connecting..."
+msgstr "Konektata…"
+
+#: src/ui/manage_accounts/dialog.vala:253
+msgid "Connected"
+msgstr "Konektita"
+
+#: src/ui/manage_accounts/dialog.vala:255
+msgid "Disconnected"
+msgstr "Malkonektita"
+
+#: src/ui/manage_accounts/dialog.vala:278
+msgid "Wrong password"
+msgstr "Malĝusta pasvorto"
+
+#: src/ui/manage_accounts/dialog.vala:281
+#: src/ui/manage_accounts/dialog.vala:283
+msgid "Error"
+msgstr "Eraro"
+
+#: src/ui/occupant_menu/view.vala:48
+msgid "Start private conversation"
+msgstr "Komenci privatan interparolon"
+
+#: src/ui/notifications.vala:64
+msgid "Subscription request"
+msgstr "Abona peto"
+
+#: src/ui/notifications.vala:66
+msgid "Accept"
+msgstr "Akcepti"
+
+#: src/ui/notifications.vala:79
+msgid "Deny"
+msgstr "Rifuzi"
+
+#: src/ui/unified_window.vala:135
+msgid "No accounts active"
+msgstr "Neniuj aktivaj kontoj"
+
+#: src/ui/unified_window.vala:136
+msgid "Manage accounts"
+msgstr "Administri kontojn"
+
+#: src/ui/unified_window.vala:143
+msgid "No conversation active"
+msgstr "Neniu aktiva interparolo"
+
+#: src/ui/unified_window.vala:144
+msgid "Add Chat"
+msgstr "Aldoni Babilon"
diff --git a/main/po/es.po b/main/po/es.po
new file mode 100644
index 00000000..c55fcb37
--- /dev/null
+++ b/main/po/es.po
@@ -0,0 +1,278 @@
+# 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-04-13 13:48+0200\n"
+"PO-Revision-Date: 2017-04-23 12:59+0000\n"
+"Language-Team: Spanish "
+"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"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+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"
+
+#: 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"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Alias"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+#, fuzzy
+msgid "Request presence updates"
+msgstr "Solicitar actualizaciones de presencia"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Apodo"
+
+#: 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:163
+msgid "Password"
+msgstr "Contraseña"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+#, fuzzy
+msgid "Join on startup"
+msgstr "Unirse en el inicio"
+
+#: data/conversation_selector/view.ui:16
+msgid "Search"
+msgstr "Buscar"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Guardar"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:217
+msgid "Local alias"
+msgstr "Alias local"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: data/manage_accounts/dialog.ui:306
+msgid "Add an account"
+msgstr "Añadir una cuenta"
+
+#: data/menu_add.ui:6
+#, fuzzy
+msgid "Start Chat"
+msgstr "Iniciar Chat"
+
+#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:145
+#, fuzzy
+msgid "Join Conference"
+msgstr "Unirse a Conferencia"
+
+#: data/menu_app.ui:10
+msgid "Settings"
+msgstr "Ajustes"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Salir"
+
+#: data/menu_conversation.ui:5
+msgid "Contact Details"
+msgstr "Detalles de Contacto"
+
+#: data/menu_encryption.ui:14
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Sin cifrar"
+
+#: data/settings_dialog.ui:8
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: data/settings_dialog.ui:23
+msgid "Send typing notifications and message marker"
+msgstr ""
+
+#: data/settings_dialog.ui:35
+msgid "Convert smileys to emojis"
+msgstr ""
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Siguiente"
+
+#: src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Unirse"
+
+#. Day and month
+#: src/ui/conversation_selector/conversation_row.vala:175
+#, fuzzy, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+msgid "Yesterday"
+msgstr "Ayer"
+
+#. Time in 24h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_summary/message_item.vala:110
+#, fuzzy, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#. Time in 12h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/message_item.vala:111
+#, fuzzy, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_summary/message_item.vala:114
+#, c-format, fuzzy
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "hace %i min"
+msgstr[1] "hace %i min"
+
+#: src/ui/conversation_selector/conversation_row.vala:188
+#: src/ui/conversation_summary/message_item.vala:116
+msgid "Just now"
+msgstr "Ahora"
+
+#. Date + time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:98
+#, fuzzy, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#. Date + time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:99
+#, fuzzy, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#. Month, day and time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:102
+#, fuzzy, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#. Month, day and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:103
+#, fuzzy, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#. Day of week and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:106
+#, fuzzy, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: src/ui/conversation_summary/message_item.vala:107
+#, fuzzy, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: src/ui/conversation_summary/view.vala:120
+msgid "is typing..."
+msgstr "está escribiendo..."
+
+#: src/ui/conversation_summary/view.vala:122
+msgid "has stopped typing"
+msgstr "ha dejado de escribir"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Añadir Cuenta"
+
+#: src/ui/manage_accounts/dialog.vala:150
+#, fuzzy
+msgid "Select avatar"
+msgstr "Seleccionar avatar"
+
+#: src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/ui/manage_accounts/dialog.vala:251
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: src/ui/manage_accounts/dialog.vala:253
+msgid "Connected"
+msgstr "Conectado"
+
+#: src/ui/manage_accounts/dialog.vala:255
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: src/ui/manage_accounts/dialog.vala:278
+msgid "Wrong password"
+msgstr "Contraseña incorrecta"
+
+#: src/ui/manage_accounts/dialog.vala:281
+#: src/ui/manage_accounts/dialog.vala:283
+msgid "Error"
+msgstr "Error"
+
+#: src/ui/occupant_menu/view.vala:48
+msgid "Start private conversation"
+msgstr "Iniciar conversación privada"
+
+#: src/ui/notifications.vala:64
+msgid "Subscription request"
+msgstr "Solicitud de suscripción"
+
+#: src/ui/notifications.vala:66
+msgid "Accept"
+msgstr "Aceptar"
+
+#: src/ui/notifications.vala:79
+msgid "Deny"
+msgstr "Denegar"
+
+#: src/ui/unified_window.vala:135
+msgid "No accounts active"
+msgstr "No hay cuentas activas"
+
+#: src/ui/unified_window.vala:136
+msgid "Manage accounts"
+msgstr "Gestionar cuentas"
+
+#: src/ui/unified_window.vala:143
+msgid "No conversation active"
+msgstr "No hay conversación activa"
+
+#: src/ui/unified_window.vala:144
+msgid "Add Chat"
+msgstr ""
diff --git a/main/po/fr.po b/main/po/fr.po
new file mode 100644
index 00000000..bfe48901
--- /dev/null
+++ b/main/po/fr.po
@@ -0,0 +1,272 @@
+# 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-04-13 13:48+0200\n"
+"PO-Revision-Date: 2017-04-19 14:27+0000\n"
+"Language-Team: French "
+"Language: fr\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"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+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"
+
+#: 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"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Alias"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Demander les mises à jour de la présence"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Pseudo"
+
+#: 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:163
+msgid "Password"
+msgstr "Mot de passe"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "Rejoindre au démarrage"
+
+#: data/conversation_selector/view.ui:16
+msgid "Search"
+msgstr "Rechercher"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Sauver"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:217
+msgid "Local alias"
+msgstr "Alias local"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Comptes"
+
+#: data/manage_accounts/dialog.ui:306
+msgid "Add an account"
+msgstr "Ajouter un compte"
+
+#: data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Commencer une discussion"
+
+#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:145
+msgid "Join Conference"
+msgstr "Rejoindre une conférence"
+
+#: data/menu_app.ui:10
+msgid "Settings"
+msgstr "Paramètres"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Quitter"
+
+#: data/menu_conversation.ui:5
+msgid "Contact Details"
+msgstr "Informations du contact"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non-chiffré"
+
+#: data/settings_dialog.ui:8
+msgid "Preferences"
+msgstr "Préférences"
+
+#: data/settings_dialog.ui:23
+msgid "Send typing notifications and message marker"
+msgstr "Envoyer les notifications de frappe et les marqueurs de message"
+
+#: data/settings_dialog.ui:35
+msgid "Convert smileys to emojis"
+msgstr "Convertir les smileys en émoticônes"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Suivant"
+
+#: src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Rejoindre"
+
+#. Day and month
+#: src/ui/conversation_selector/conversation_row.vala:175
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+msgid "Yesterday"
+msgstr "Hier"
+
+#. Time in 24h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_summary/message_item.vala:110
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%Hh%M"
+
+#. Time in 12h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/message_item.vala:111
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M"
+
+#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_summary/message_item.vala:114
+#, 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:188
+#: src/ui/conversation_summary/message_item.vala:116
+msgid "Just now"
+msgstr "À l’instant"
+
+#. Date + time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:98
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %Hh%M"
+
+#. Date + time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:99
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M"
+
+#. Month, day and time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:102
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %Hh%M"
+
+#. Month, day and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:103
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M"
+
+#. Day of week and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:106
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %Hh%M"
+
+#: src/ui/conversation_summary/message_item.vala:107
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M"
+
+#: src/ui/conversation_summary/view.vala:120
+msgid "is typing..."
+msgstr "est en train d’écrire…"
+
+#: src/ui/conversation_summary/view.vala:122
+msgid "has stopped typing"
+msgstr "a arrêté d’écrire"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Ajouter un compte"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "Choisir un avatar"
+
+#: src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Choisir"
+
+#: src/ui/manage_accounts/dialog.vala:251
+msgid "Connecting..."
+msgstr "Connexion…"
+
+#: src/ui/manage_accounts/dialog.vala:253
+msgid "Connected"
+msgstr "Connecté"
+
+#: src/ui/manage_accounts/dialog.vala:255
+msgid "Disconnected"
+msgstr "Déconnecté"
+
+#: src/ui/manage_accounts/dialog.vala:278
+msgid "Wrong password"
+msgstr "Mauvais mot de passe"
+
+#: src/ui/manage_accounts/dialog.vala:281
+#: src/ui/manage_accounts/dialog.vala:283
+msgid "Error"
+msgstr "Erreur"
+
+#: src/ui/occupant_menu/view.vala:48
+msgid "Start private conversation"
+msgstr "Commencer une discussion privée"
+
+#: src/ui/notifications.vala:64
+msgid "Subscription request"
+msgstr "Demande d’abonnement"
+
+#: src/ui/notifications.vala:66
+msgid "Accept"
+msgstr "Accepter"
+
+#: src/ui/notifications.vala:79
+msgid "Deny"
+msgstr "Refuser"
+
+#: src/ui/unified_window.vala:135
+msgid "No accounts active"
+msgstr "Aucun compte actif"
+
+#: src/ui/unified_window.vala:136
+msgid "Manage accounts"
+msgstr "Gérer les comptes"
+
+#: src/ui/unified_window.vala:143
+msgid "No conversation active"
+msgstr "Aucune discussion en cours"
+
+#: src/ui/unified_window.vala:144
+msgid "Add Chat"
+msgstr "Ajouter discussion"
diff --git a/main/po/it.po b/main/po/it.po
new file mode 100644
index 00000000..80f1118a
--- /dev/null
+++ b/main/po/it.po
@@ -0,0 +1,273 @@
+# 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-04-13 13:48+0200\n"
+"PO-Revision-Date: 2017-04-15 11:31+0000\n"
+"Language-Team: Italian "
+"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"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+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"
+
+#: 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"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Alias"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Richiedi gli aggiornamenti di stato"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Soprannome"
+
+#: 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:163
+msgid "Password"
+msgstr "Password"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "Entra all'avvio"
+
+#: data/conversation_selector/view.ui:16
+msgid "Search"
+msgstr "Cerca"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Salva"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:217
+msgid "Local alias"
+msgstr "Alias locale"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Accounts"
+
+#: data/manage_accounts/dialog.ui:306
+msgid "Add an account"
+msgstr "Aggiungi un account"
+
+#: data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Inizia una conversazione"
+
+#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:145
+msgid "Join Conference"
+msgstr "Entra in una conferenza"
+
+#: data/menu_app.ui:10
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Esci"
+
+#: data/menu_conversation.ui:5
+msgid "Contact Details"
+msgstr "Dettagli del contatto"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Non cifrato"
+
+#: data/settings_dialog.ui:8
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: data/settings_dialog.ui:23
+msgid "Send typing notifications and message marker"
+msgstr "Invia notifiche di digitazione e stato dei messaggi"
+
+#: data/settings_dialog.ui:35
+#, fuzzy
+msgid "Convert smileys to emojis"
+msgstr "Converte smileys in emojis"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Prossimo"
+
+#: src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Entra"
+
+#. Day and month
+#: src/ui/conversation_selector/conversation_row.vala:175
+#, no-c-format
+msgid "%b %d"
+msgstr "%d %b"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+msgid "Yesterday"
+msgstr "Ieri"
+
+#. Time in 24h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_summary/message_item.vala:110
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#. Time in 12h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/message_item.vala:111
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_summary/message_item.vala:114
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i min fa"
+msgstr[1] "%i min fa"
+
+#: src/ui/conversation_selector/conversation_row.vala:188
+#: src/ui/conversation_summary/message_item.vala:116
+msgid "Just now"
+msgstr "Adesso"
+
+#. Date + time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:98
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#. Date + time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:99
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#. Month, day and time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:102
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H∶%M"
+
+#. Month, day and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:103
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#. Day of week and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:106
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: src/ui/conversation_summary/message_item.vala:107
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: src/ui/conversation_summary/view.vala:120
+msgid "is typing..."
+msgstr "sta scrivendo..."
+
+#: src/ui/conversation_summary/view.vala:122
+msgid "has stopped typing"
+msgstr "ha smesso di scrivere"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Aggiungi Account"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "Seleziona avatar"
+
+#: src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Seleziona"
+
+#: src/ui/manage_accounts/dialog.vala:251
+msgid "Connecting..."
+msgstr "Connessione..."
+
+#: src/ui/manage_accounts/dialog.vala:253
+msgid "Connected"
+msgstr "Connesso"
+
+#: src/ui/manage_accounts/dialog.vala:255
+msgid "Disconnected"
+msgstr "Disconnesso"
+
+#: src/ui/manage_accounts/dialog.vala:278
+msgid "Wrong password"
+msgstr "Password errata"
+
+#: src/ui/manage_accounts/dialog.vala:281
+#: src/ui/manage_accounts/dialog.vala:283
+msgid "Error"
+msgstr "Errore"
+
+#: src/ui/occupant_menu/view.vala:48
+msgid "Start private conversation"
+msgstr "Inizia una conversazione privata"
+
+#: src/ui/notifications.vala:64
+msgid "Subscription request"
+msgstr "Richiesta di sottoscrizione"
+
+#: src/ui/notifications.vala:66
+msgid "Accept"
+msgstr "Accetta"
+
+#: src/ui/notifications.vala:79
+msgid "Deny"
+msgstr "Rifiuta"
+
+#: src/ui/unified_window.vala:135
+msgid "No accounts active"
+msgstr "Nessun account attivo"
+
+#: src/ui/unified_window.vala:136
+msgid "Manage accounts"
+msgstr "Gestisci accounts"
+
+#: src/ui/unified_window.vala:143
+msgid "No conversation active"
+msgstr "Nessuna conversazione attiva"
+
+#: src/ui/unified_window.vala:144
+msgid "Add Chat"
+msgstr "Aggiungi conversazione"
diff --git a/main/po/nl.po b/main/po/nl.po
new file mode 100644
index 00000000..e98f0259
--- /dev/null
+++ b/main/po/nl.po
@@ -0,0 +1,272 @@
+# 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-04-13 13:48+0200\n"
+"PO-Revision-Date: 2017-04-22 15:58+0000\n"
+"Language-Team: Dutch "
+"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"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+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"
+
+#: 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"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Alias"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Vraag om aanwezigheidsupdates"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Schermnaam"
+
+#: 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:163
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "Deelnemen bij opstarten"
+
+#: data/conversation_selector/view.ui:16
+msgid "Search"
+msgstr "Zoeken"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Opslaan"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:217
+msgid "Local alias"
+msgstr "Lokale alias"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Accounts"
+
+#: data/manage_accounts/dialog.ui:306
+msgid "Add an account"
+msgstr "Account toevoegen"
+
+#: data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Gesprek beginnen"
+
+#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:145
+msgid "Join Conference"
+msgstr "Deelnemen aan groepsgesprek"
+
+#: data/menu_app.ui:10
+msgid "Settings"
+msgstr "Instellingen"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: data/menu_conversation.ui:5
+msgid "Contact Details"
+msgstr "Contactgegevens"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Onversleuteld"
+
+#: data/settings_dialog.ui:8
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: data/settings_dialog.ui:23
+msgid "Send typing notifications and message marker"
+msgstr "Stuur aan-het-typen-meldingen en berichtmarkers"
+
+#: data/settings_dialog.ui:35
+msgid "Convert smileys to emojis"
+msgstr "Smileys omzetten naar emoji's"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Volgende"
+
+#: src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Deelnemen"
+
+#. Day and month
+#: src/ui/conversation_selector/conversation_row.vala:175
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+msgid "Yesterday"
+msgstr "Gisteren"
+
+#. Time in 24h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_summary/message_item.vala:110
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#. Time in 12h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/message_item.vala:111
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_summary/message_item.vala:114
+#, 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:188
+#: src/ui/conversation_summary/message_item.vala:116
+msgid "Just now"
+msgstr "Zojuist"
+
+#. Date + time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:98
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#. Date + time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:99
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#. Month, day and time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:102
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%d %b, %H:%M"
+
+#. Month, day and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:103
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%d %b, %l∶%M %p"
+
+#. Day of week and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:106
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: src/ui/conversation_summary/message_item.vala:107
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: src/ui/conversation_summary/view.vala:120
+msgid "is typing..."
+msgstr "is aan het typen..."
+
+#: src/ui/conversation_summary/view.vala:122
+msgid "has stopped typing"
+msgstr "is gestopt met typen"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Account toevoegen"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "Kies een avatar"
+
+#: src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Selecteren"
+
+#: src/ui/manage_accounts/dialog.vala:251
+msgid "Connecting..."
+msgstr "Verbinding maken..."
+
+#: src/ui/manage_accounts/dialog.vala:253
+msgid "Connected"
+msgstr "Verbonden"
+
+#: src/ui/manage_accounts/dialog.vala:255
+msgid "Disconnected"
+msgstr "Verbinding verbroken"
+
+#: src/ui/manage_accounts/dialog.vala:278
+msgid "Wrong password"
+msgstr "Verkeerd wachtwoord"
+
+#: src/ui/manage_accounts/dialog.vala:281
+#: src/ui/manage_accounts/dialog.vala:283
+msgid "Error"
+msgstr "Fout"
+
+#: src/ui/occupant_menu/view.vala:48
+msgid "Start private conversation"
+msgstr "Privégesprek beginnen"
+
+#: src/ui/notifications.vala:64
+msgid "Subscription request"
+msgstr "Abonneringsverzoek"
+
+#: src/ui/notifications.vala:66
+msgid "Accept"
+msgstr "Toestaan"
+
+#: src/ui/notifications.vala:79
+msgid "Deny"
+msgstr "Afwijzen"
+
+#: src/ui/unified_window.vala:135
+msgid "No accounts active"
+msgstr "Geen accounts actief"
+
+#: src/ui/unified_window.vala:136
+msgid "Manage accounts"
+msgstr "Accounts beheren"
+
+#: src/ui/unified_window.vala:143
+msgid "No conversation active"
+msgstr "Geen gesprekken actief"
+
+#: src/ui/unified_window.vala:144
+msgid "Add Chat"
+msgstr "Gesprek beginnen"
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
new file mode 100644
index 00000000..ce00839b
--- /dev/null
+++ b/main/po/pt_BR.po
@@ -0,0 +1,271 @@
+# 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-04-13 13:48+0200\n"
+"PO-Revision-Date: 2017-04-29 22:51+0000\n"
+"Language: pt_BR\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"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+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"
+
+#: 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"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "Pseudônimo"
+
+#: data/add_conversation/add_contact_dialog.ui:129
+msgid "Request presence updates"
+msgstr "Pedir atualizações sobre presença"
+
+#: data/add_conversation/add_groupchat_dialog.ui:120
+#: data/add_conversation/conference_details_fragment.ui:120
+msgid "Nick"
+msgstr "Apelido"
+
+#: 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:163
+msgid "Password"
+msgstr "Senha"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "Conectar-se ao inicializar"
+
+#: data/conversation_selector/view.ui:16
+msgid "Search"
+msgstr "Pesquisar"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "Salvar"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:217
+msgid "Local alias"
+msgstr "Pseudônimo local"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "Contas"
+
+#: data/manage_accounts/dialog.ui:306
+msgid "Add an account"
+msgstr "Adicionar conta"
+
+#: data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "Iniciar bate-papo"
+
+#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:145
+msgid "Join Conference"
+msgstr "Juntar-se a uma conferência"
+
+#: data/menu_app.ui:10
+msgid "Settings"
+msgstr "Configurações"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "Sair"
+
+#: data/menu_conversation.ui:5
+msgid "Contact Details"
+msgstr "Detalhes do contato"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "Não-criptografado"
+
+#: data/settings_dialog.ui:8
+msgid "Preferences"
+msgstr "Preferências"
+
+#: data/settings_dialog.ui:23
+msgid "Send typing notifications and message marker"
+msgstr "Enviar notificações quando digitando e marcador de mensagens"
+
+#: data/settings_dialog.ui:35
+msgid "Convert smileys to emojis"
+msgstr "Converter smileys para emojis"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "Próximo"
+
+#: src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "Juntar-se"
+
+#. Day and month
+#: src/ui/conversation_selector/conversation_row.vala:175
+#, no-c-format
+msgid "%b %d"
+msgstr "%b %d"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+msgid "Yesterday"
+msgstr "Ontem"
+
+#. Time in 24h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_summary/message_item.vala:110
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#. Time in 12h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/message_item.vala:111
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_summary/message_item.vala:114
+#, 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:188
+#: src/ui/conversation_summary/message_item.vala:116
+msgid "Just now"
+msgstr "Agora há pouco"
+
+#. Date + time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:98
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#. Date + time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:99
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#. Month, day and time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:102
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%b %d, %H∶%M"
+
+#. Month, day and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:103
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%b %d, %l∶%M %p"
+
+#. Day of week and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:106
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%a, %H∶%M"
+
+#: src/ui/conversation_summary/message_item.vala:107
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%a, %l∶%M %p"
+
+#: src/ui/conversation_summary/view.vala:120
+msgid "is typing..."
+msgstr "está digitando..."
+
+#: src/ui/conversation_summary/view.vala:122
+msgid "has stopped typing"
+msgstr "parou de digitar"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "Adicionar conta"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "Escolher avatar"
+
+#: src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "Selecionar"
+
+#: src/ui/manage_accounts/dialog.vala:251
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: src/ui/manage_accounts/dialog.vala:253
+msgid "Connected"
+msgstr "Conectado"
+
+#: src/ui/manage_accounts/dialog.vala:255
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: src/ui/manage_accounts/dialog.vala:278
+msgid "Wrong password"
+msgstr "Senha errada"
+
+#: src/ui/manage_accounts/dialog.vala:281
+#: src/ui/manage_accounts/dialog.vala:283
+msgid "Error"
+msgstr "Erro"
+
+#: src/ui/occupant_menu/view.vala:48
+msgid "Start private conversation"
+msgstr "Iniciar conversa privada"
+
+#: src/ui/notifications.vala:64
+msgid "Subscription request"
+msgstr "Pedido de assinatura"
+
+#: src/ui/notifications.vala:66
+msgid "Accept"
+msgstr "Aceitar"
+
+#: src/ui/notifications.vala:79
+msgid "Deny"
+msgstr "Negar"
+
+#: src/ui/unified_window.vala:135
+msgid "No accounts active"
+msgstr "Nenhuma conta ativa"
+
+#: src/ui/unified_window.vala:136
+msgid "Manage accounts"
+msgstr "Gerenciar contas"
+
+#: src/ui/unified_window.vala:143
+msgid "No conversation active"
+msgstr "Nenhuma conversa ativa"
+
+#: src/ui/unified_window.vala:144
+msgid "Add Chat"
+msgstr "Adicionar bate-papo"
diff --git a/main/po/zh_Hans.po b/main/po/zh_Hans.po
new file mode 100644
index 00000000..237f1a83
--- /dev/null
+++ b/main/po/zh_Hans.po
@@ -0,0 +1,271 @@
+# Chinese translations for PACKAGE package
+# PACKAGE 软件包的简体中文翻译.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Tong Hui <tonghuix@gmail.com>, 2017.
+msgid ""
+msgstr ""
+"Project-Id-Version: dino\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-13 13:48+0200\n"
+"PO-Revision-Date: 2017-05-29 17:17+0000\n"
+"Language-Team: Chinese (Simplified) "
+"Language: zh_Hans\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: data/add_conversation/add_contact_dialog.ui:11
+#: data/add_conversation/add_groupchat_dialog.ui:11
+#: src/ui/add_conversation/conference/dialog.vala:15
+#: src/ui/manage_accounts/dialog.vala:151
+msgid "Cancel"
+msgstr "取消"
+
+#: data/add_conversation/add_contact_dialog.ui:23
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:28
+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
+msgid "Account"
+msgstr "账号"
+
+#: data/add_conversation/add_contact_dialog.ui:101
+#: data/add_conversation/add_groupchat_dialog.ui:189
+msgid "Alias"
+msgstr "别名"
+
+#: 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
+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:163
+msgid "Password"
+msgstr "密码"
+
+#: data/add_conversation/add_groupchat_dialog.ui:176
+msgid "Join on startup"
+msgstr "启动时加入"
+
+#: data/conversation_selector/view.ui:16
+msgid "Search"
+msgstr "搜索"
+
+#: data/manage_accounts/add_account_dialog.ui:21
+#: src/ui/add_conversation/conference/add_groupchat_dialog.vala:42
+msgid "Save"
+msgstr "保存"
+
+#: data/manage_accounts/add_account_dialog.ui:102
+#: data/manage_accounts/dialog.ui:217
+msgid "Local alias"
+msgstr "本地别名"
+
+#: data/manage_accounts/dialog.ui:9 data/menu_app.ui:6
+msgid "Accounts"
+msgstr "帐号"
+
+#: data/manage_accounts/dialog.ui:306
+msgid "Add an account"
+msgstr "添加新账号"
+
+#: data/menu_add.ui:6
+msgid "Start Chat"
+msgstr "开始聊天"
+
+#: data/menu_add.ui:12 src/ui/add_conversation/conference/dialog.vala:26
+#: src/ui/unified_window.vala:145
+msgid "Join Conference"
+msgstr "加入群聊"
+
+#: data/menu_app.ui:10
+msgid "Settings"
+msgstr "设置"
+
+#: data/menu_app.ui:16
+msgid "Quit"
+msgstr "退出"
+
+#: data/menu_conversation.ui:5
+msgid "Contact Details"
+msgstr "联系人详情"
+
+#: data/menu_encryption.ui:14
+msgid "Unencrypted"
+msgstr "未加密"
+
+#: data/settings_dialog.ui:8
+msgid "Preferences"
+msgstr "选项"
+
+#: data/settings_dialog.ui:23
+msgid "Send typing notifications and message marker"
+msgstr "发送打字通知和消息标记"
+
+#: data/settings_dialog.ui:35
+msgid "Convert smileys to emojis"
+msgstr "将笑脸转换成 Emoji"
+
+#: src/ui/add_conversation/conference/dialog.vala:45
+msgid "Next"
+msgstr "下一个"
+
+#: src/ui/add_conversation/conference/dialog.vala:60
+msgid "Join"
+msgstr "加入"
+
+#. Day and month
+#: src/ui/conversation_selector/conversation_row.vala:175
+#, no-c-format
+msgid "%b %d"
+msgstr "%_m 月 %_d 日"
+
+#: src/ui/conversation_selector/conversation_row.vala:179
+msgid "Yesterday"
+msgstr "昨天"
+
+#. Time in 24h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:182
+#: src/ui/conversation_summary/message_item.vala:110
+#, no-c-format
+msgid "%H∶%M"
+msgstr "%H∶%M"
+
+#. Time in 12h format (w/o seconds)
+#: src/ui/conversation_selector/conversation_row.vala:183
+#: src/ui/conversation_summary/message_item.vala:111
+#, no-c-format
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: src/ui/conversation_selector/conversation_row.vala:186
+#: src/ui/conversation_summary/message_item.vala:114
+#, c-format
+msgid "%i min ago"
+msgid_plural "%i mins ago"
+msgstr[0] "%i 分钟以前"
+
+#: src/ui/conversation_selector/conversation_row.vala:188
+#: src/ui/conversation_summary/message_item.vala:116
+msgid "Just now"
+msgstr "刚刚"
+
+#. Date + time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:98
+#, no-c-format
+msgid "%x, %H∶%M"
+msgstr "%x, %H∶%M"
+
+#. Date + time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:99
+#, no-c-format
+msgid "%x, %l∶%M %p"
+msgstr "%x, %l∶%M %p"
+
+#. Month, day and time in 24h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:102
+#, no-c-format
+msgid "%b %d, %H∶%M"
+msgstr "%_m 月 %_d 日，%H∶%M"
+
+#. Month, day and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:103
+#, no-c-format
+msgid "%b %d, %l∶%M %p"
+msgstr "%_m 月 %_d 日，%l∶%M %p"
+
+#. Day of week and time in 12h format (w/o seconds)
+#: src/ui/conversation_summary/message_item.vala:106
+#, no-c-format
+msgid "%a, %H∶%M"
+msgstr "%A，%H∶%M"
+
+#: src/ui/conversation_summary/message_item.vala:107
+#, no-c-format
+msgid "%a, %l∶%M %p"
+msgstr "%A，%l∶%M %p"
+
+#: src/ui/conversation_summary/view.vala:120
+msgid "is typing..."
+msgstr "正在输入..."
+
+#: src/ui/conversation_summary/view.vala:122
+msgid "has stopped typing"
+msgstr "已经停止输入"
+
+#: src/ui/manage_accounts/add_account_dialog.vala:21
+msgid "Add Account"
+msgstr "添加帐号"
+
+#: src/ui/manage_accounts/dialog.vala:150
+msgid "Select avatar"
+msgstr "选择头像"
+
+#: src/ui/manage_accounts/dialog.vala:152
+msgid "Select"
+msgstr "选择"
+
+#: src/ui/manage_accounts/dialog.vala:251
+msgid "Connecting..."
+msgstr "连接中..."
+
+#: src/ui/manage_accounts/dialog.vala:253
+msgid "Connected"
+msgstr "已连接"
+
+#: src/ui/manage_accounts/dialog.vala:255
+msgid "Disconnected"
+msgstr "已断开连接"
+
+#: src/ui/manage_accounts/dialog.vala:278
+msgid "Wrong password"
+msgstr "密码错误"
+
+#: src/ui/manage_accounts/dialog.vala:281
+#: src/ui/manage_accounts/dialog.vala:283
+msgid "Error"
+msgstr "错误"
+
+#: src/ui/occupant_menu/view.vala:48
+msgid "Start private conversation"
+msgstr "启动私密会话"
+
+#: src/ui/notifications.vala:64
+msgid "Subscription request"
+msgstr "订阅请求"
+
+#: src/ui/notifications.vala:66
+msgid "Accept"
+msgstr "接受"
+
+#: src/ui/notifications.vala:79
+msgid "Deny"
+msgstr "拒绝"
+
+#: src/ui/unified_window.vala:135
+msgid "No accounts active"
+msgstr "没有激活的帐号"
+
+#: src/ui/unified_window.vala:136
+msgid "Manage accounts"
+msgstr "管理帐号"
+
+#: src/ui/unified_window.vala:143
+msgid "No conversation active"
+msgstr "没有激活的会话"
+
+#: src/ui/unified_window.vala:144
+msgid "Add Chat"
+msgstr "添加聊天"
diff --git a/main/src/ui/contact_details/muc_config_form_provider.vala b/main/src/ui/contact_details/muc_config_form_provider.vala
index 44659888..2986134a 100644
--- a/main/src/ui/contact_details/muc_config_form_provider.vala
+++ b/main/src/ui/contact_details/muc_config_form_provider.vala
@@ -39,15 +39,14 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider {
         string? desc = null;
         switch (field.var) {
             case "muc#roomconfig_roomname":
-                label = _("Name");
-                desc = _("Name of the room");
+                label = _("Name of the room");
                 break;
             case "muc#roomconfig_roomdesc":
-                label = _("Description");
-                desc = _("Description of the room");
+                label = _("Description of the room");
                 break;
             case "muc#roomconfig_persistentroom":
                 label = _("Persistent");
+                desc = _("The room will persist after the last occupant exits");
                 break;
             case "muc#roomconfig_publicroom":
                 label = _("Publicly searchable");
@@ -56,22 +55,23 @@ public class MucConfigFormProvider : Plugins.ContactDetailsProvider {
                 label = _("Occupants may change subject");
                 break;
             case "muc#roomconfig_whois":
-                label = _("Discover real jids");
-                desc = "Who may discover real jids";
+                label = _("Discover real JIDs");
+                desc = _("Who may discover real JIDs?");
                 break;
             case "muc#roomconfig_roomsecret":
                 label = _("Password");
-                desc = _("Passwort required to enter the room. Leave empty for none.");
+                desc = _("Password required to enter the room. Leave empty for none");
                 break;
             case "muc#roomconfig_moderatedroom":
                 label = _("Moderated");
+                desc = _("Only occupants with voice may send messages");
                 break;
             case "muc#roomconfig_membersonly":
                 label = _("Members only");
                 desc = _("Only members may enter the room");
                 break;
             case "muc#roomconfig_historylength":
-                label = _("Message History");
+                label = _("Message history");
                 desc = _("Maximum number of history messages returned by the room");
                 break;
         }
diff --git a/plugins/omemo/po/LINGUAS b/plugins/omemo/po/LINGUAS
index 685f65ef..46544078 100644
--- a/plugins/omemo/po/LINGUAS
+++ b/plugins/omemo/po/LINGUAS
@@ -1,2 +1,5 @@
 de
-en
\ No newline at end of file
+en
+it
+nl
+zh_Hans
diff --git a/plugins/omemo/po/it.po b/plugins/omemo/po/it.po
new file mode 100644
index 00000000..1c5a0f04
--- /dev/null
+++ b/plugins/omemo/po/it.po
@@ -0,0 +1,27 @@
+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"
+"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
+msgid "Own fingerprint"
+msgstr "Propria fingerprint"
+
+#: src/account_settings_widget.vala:35
+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"
diff --git a/plugins/omemo/po/nl.po b/plugins/omemo/po/nl.po
new file mode 100644
index 00000000..3c8f28ea
--- /dev/null
+++ b/plugins/omemo/po/nl.po
@@ -0,0 +1,24 @@
+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"
+"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"
+
+#: src/account_settings_widget.vala:35 src/account_settings_widget.vala:52
+#: src/account_settings_widget.vala:55
+msgid "Own fingerprint"
+msgstr "Eigen vingerafdruk"
+
+#: src/account_settings_widget.vala:35
+msgid "Will be generated on first connect"
+msgstr "Wordt bij eerste contact gegenereerd"
+
+#: src/account_settings_widget.vala:55
+msgid "Database error"
+msgstr "Database fout"
diff --git a/plugins/omemo/po/zh_Hans.po b/plugins/omemo/po/zh_Hans.po
new file mode 100644
index 00000000..35d6eaa2
--- /dev/null
+++ b/plugins/omemo/po/zh_Hans.po
@@ -0,0 +1,23 @@
+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"
+"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:35
+msgid "Will be generated on first connect"
+msgstr "会在第一次连接时生成"
+
+#: src/account_settings_widget.vala:55
+msgid "Database error"
+msgstr "数据库错误"
diff --git a/plugins/openpgp/po/LINGUAS b/plugins/openpgp/po/LINGUAS
index 685f65ef..46544078 100644
--- a/plugins/openpgp/po/LINGUAS
+++ b/plugins/openpgp/po/LINGUAS
@@ -1,2 +1,5 @@
 de
-en
\ No newline at end of file
+en
+it
+nl
+zh_Hans
diff --git a/plugins/openpgp/po/it.po b/plugins/openpgp/po/it.po
new file mode 100644
index 00000000..7c98074f
--- /dev/null
+++ b/plugins/openpgp/po/it.po
@@ -0,0 +1,39 @@
+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"
+"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
+msgid "Key publishing disabled"
+msgstr "Pubblicazione della chiave disabilitata"
+
+#: src/account_settings_widget.vala:74
+msgid "No keys available. Generate one!"
+msgstr "Nessuna chiave disponibile. Generane una!"
+
+#: src/account_settings_widget.vala:80
+msgid "Select key"
+msgstr "Seleziona una chiave"
+
+#: src/account_settings_widget.vala:97
+msgid "Loading..."
+msgstr "Caricamento..."
+
+#: src/account_settings_widget.vala:97
+msgid "Querying GnuPG"
+msgstr "Interrogando GnuPG"
+
+#: src/account_settings_widget.vala:108
+msgid "Error in GnuPG"
+msgstr "Errore in GnuPG"
diff --git a/plugins/openpgp/po/nl.po b/plugins/openpgp/po/nl.po
new file mode 100644
index 00000000..ba41359d
--- /dev/null
+++ b/plugins/openpgp/po/nl.po
@@ -0,0 +1,39 @@
+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"
+"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
+msgid "Key publishing disabled"
+msgstr "Publiceren sleutel uitgeschakeld"
+
+#: src/account_settings_widget.vala:74
+msgid "No keys available. Generate one!"
+msgstr "Geen sleutels voorhanden. Genereer er een!"
+
+#: src/account_settings_widget.vala:80
+msgid "Select key"
+msgstr "Sleutel selecteren"
+
+#: src/account_settings_widget.vala:97
+msgid "Loading..."
+msgstr "Laden..."
+
+#: src/account_settings_widget.vala:97
+msgid "Querying GnuPG"
+msgstr "GnuPG Vragen"
+
+#: src/account_settings_widget.vala:108
+msgid "Error in GnuPG"
+msgstr "Fout in GnuPG"
diff --git a/plugins/openpgp/po/zh_Hans.po b/plugins/openpgp/po/zh_Hans.po
new file mode 100644
index 00000000..35d6eaa2
--- /dev/null
+++ b/plugins/openpgp/po/zh_Hans.po
@@ -0,0 +1,23 @@
+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"
+"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:35
+msgid "Will be generated on first connect"
+msgstr "会在第一次连接时生成"
+
+#: src/account_settings_widget.vala:55
+msgid "Database error"
+msgstr "数据库错误"